diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-31 00:13:25 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-31 00:13:25 +0000 |
commit | 19c1013adaced0edffd556a26557a81c1d03261c (patch) | |
tree | db65f13454293a1ebe7f49cac774ee97614eb71c | |
parent | 30abc247e0be4ce8ad3df1862f493b523d05230c (diff) |
wait4(2) takes and returns pid_t, not int. OK deraadt@ and miod@
-rw-r--r-- | sys/kern/kern_exit.c | 6 | ||||
-rw-r--r-- | sys/kern/syscalls.master | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index e7c9f385b24..9ceefda1e08 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.47 2003/08/03 19:25:49 millert Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.48 2003/12/31 00:13:24 millert Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -379,14 +379,14 @@ reaper(void) } } -int +pid_t sys_wait4(q, v, retval) register struct proc *q; void *v; register_t *retval; { register struct sys_wait4_args /* { - syscallarg(int) pid; + syscallarg(pid_t) pid; syscallarg(int *) status; syscallarg(int) options; syscallarg(struct rusage *) rusage; diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index a4ab6e5a97c..b8bb6d8cd50 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ -; $OpenBSD: syscalls.master,v 1.64 2003/12/11 23:02:30 millert Exp $ +; $OpenBSD: syscalls.master,v 1.65 2003/12/31 00:13:24 millert Exp $ ; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -58,7 +58,7 @@ 5 STD { int sys_open(const char *path, \ int flags, ... int mode); } 6 STD { int sys_close(int fd); } -7 STD { int sys_wait4(int pid, int *status, int options, \ +7 STD { pid_t sys_wait4(pid_t pid, int *status, int options, \ struct rusage *rusage); } 8 COMPAT_43 { int sys_creat(const char *path, int mode); } ocreat 9 STD { int sys_link(const char *path, const char *link); } |