Merge commit 'origin/master' into page

1 files changed, 2 insertions, 2 deletions

diff --git a/user.h b/user.h
index 431428c..9e26cf1 100644
--- a/user.h
+++ b/user.h
@@ -18,10 +18,10 @@ int link(char*, char*);
 int mkdir(char*);
 int chdir(char*);
 int dup(int);
-int getpid();
+int getpid(void);
 char* sbrk(int);
 int sleep(int);
-int uptime();
+int uptime(void);
 
 // ulib.c
 int stat(char*, struct stat*);