Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / src / lib / user / syscall.h

diff --git a/src/lib/user/syscall.h b/src/lib/user/syscall.h
index f6294667428490acd3debb417c7c369981ca7a17..c2941087faa09de8dca3c6f434fbcf0f35aea99f 100644 (file)
--- a/src/lib/user/syscall.h
+++ b/src/lib/user/syscall.h
@@ -8,12 +8,12 @@ typedef int pid_t;
 #define PID_ERROR ((pid_t) -1)
 
 typedef int mapid_t;
-#define MAPID_ERROR ((mapid_t) -1)
+#define MAP_FAILED ((mapid_t) -1)
 
 void halt (void) NO_RETURN;
 void exit (int status) NO_RETURN;
 pid_t exec (const char *file);
-int join (pid_t);
+int wait (pid_t);
 bool create (const char *file, unsigned initial_size);
 bool remove (const char *file);
 int open (const char *file);