nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename SYSCALL_WAIT to SYSCALL_WAITPID.

This commit is contained in:
Jonas 'Sortie' Termansen 2013-06-12 13:00:11 +02:00
parent 311423856e
commit 7a6b4920ce
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/waitpid.cpp
View File

@ -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. This file is part of the Sortix C Library.
@ -25,9 +25,9 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/wait.h> #include <sys/wait.h>
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) extern "C" pid_t waitpid(pid_t pid, int* status, int options)
{ {
return sys_wait(pid, status, options); return sys_waitpid(pid, status, options);
} }

2
sortix/include/sortix/syscallnum.h
View File

@ -40,7 +40,7 @@
#define SYSCALL_GETPPID 14 #define SYSCALL_GETPPID 14
#define SYSCALL_GET_FILEINFO 15 #define SYSCALL_GET_FILEINFO 15
#define SYSCALL_GET_NUM_FILES 16 #define SYSCALL_GET_NUM_FILES 16
#define SYSCALL_WAIT 17 #define SYSCALL_WAITPID 17
#define SYSCALL_READ 18 #define SYSCALL_READ 18
#define SYSCALL_WRITE 19 #define SYSCALL_WRITE 19
#define SYSCALL_PIPE 20 #define SYSCALL_PIPE 20

2
sortix/process.cpp
View File

@ -1215,7 +1215,7 @@ void Process::Init()
Syscall::Register(SYSCALL_SETPGID, (void*) sys_setpgid); Syscall::Register(SYSCALL_SETPGID, (void*) sys_setpgid);
Syscall::Register(SYSCALL_TFORK, (void*) sys_tfork); Syscall::Register(SYSCALL_TFORK, (void*) sys_tfork);
Syscall::Register(SYSCALL_UMASK, (void*) sys_umask); 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; pidalloclock = KTHREAD_MUTEX_INITIALIZER;
nextpidtoallocate = 0; nextpidtoallocate = 0;