From 7a6b4920cec55cc028a1643cfb6dd33d9dfb0cd1 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Wed, 12 Jun 2013 13:00:11 +0200 Subject: [PATCH] Rename SYSCALL_WAIT to SYSCALL_WAITPID. --- libc/waitpid.cpp | 6 +++--- sortix/include/sortix/syscallnum.h | 2 +- sortix/process.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libc/waitpid.cpp b/libc/waitpid.cpp index 07215109..d5390f9c 100644 --- a/libc/waitpid.cpp +++ b/libc/waitpid.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. This file is part of the Sortix C Library. @@ -25,9 +25,9 @@ #include #include -DEFN_SYSCALL3(pid_t, sys_wait, SYSCALL_WAIT, pid_t, int*, int); +DEFN_SYSCALL3(pid_t, sys_waitpid, SYSCALL_WAITPID, pid_t, int*, int); extern "C" pid_t waitpid(pid_t pid, int* status, int options) { - return sys_wait(pid, status, options); + return sys_waitpid(pid, status, options); } diff --git a/sortix/include/sortix/syscallnum.h b/sortix/include/sortix/syscallnum.h index fc796650..dcf08643 100644 --- a/sortix/include/sortix/syscallnum.h +++ b/sortix/include/sortix/syscallnum.h @@ -40,7 +40,7 @@ #define SYSCALL_GETPPID 14 #define SYSCALL_GET_FILEINFO 15 #define SYSCALL_GET_NUM_FILES 16 -#define SYSCALL_WAIT 17 +#define SYSCALL_WAITPID 17 #define SYSCALL_READ 18 #define SYSCALL_WRITE 19 #define SYSCALL_PIPE 20 diff --git a/sortix/process.cpp b/sortix/process.cpp index f83b40d4..71d22f8e 100644 --- a/sortix/process.cpp +++ b/sortix/process.cpp @@ -1215,7 +1215,7 @@ void Process::Init() Syscall::Register(SYSCALL_SETPGID, (void*) sys_setpgid); Syscall::Register(SYSCALL_TFORK, (void*) sys_tfork); Syscall::Register(SYSCALL_UMASK, (void*) sys_umask); - Syscall::Register(SYSCALL_WAIT, (void*) sys_waitpid); + Syscall::Register(SYSCALL_WAITPID, (void*) sys_waitpid); pidalloclock = KTHREAD_MUTEX_INITIALIZER; nextpidtoallocate = 0;