diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/waitpid.c | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d84ce36dc7..4e4ca5712e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-05-13 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/waitpid.c: Use waitpid syscall is available. + 2003-05-12 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/bits/atomic.h diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c index 2b4e7b37d4..32b01c0a5f 100644 --- a/sysdeps/unix/sysv/linux/waitpid.c +++ b/sysdeps/unix/sysv/linux/waitpid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,95,96,97,2002 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,95,96,97,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,11 +25,21 @@ __pid_t __libc_waitpid (__pid_t pid, int *stat_loc, int options) { if (SINGLE_THREAD_P) - return INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL); + { +#ifdef __NR_waitpid + return INLINE_SYSCALL (waitpid, 3, pid, stat_loc, options); +#else + return INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL); +#endif + } int oldtype = LIBC_CANCEL_ASYNC (); +#ifdef __NR_waitpid + int result = INLINE_SYSCALL (waitpid, 3, pid, stat_loc, options); +#else int result = INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL); +#endif LIBC_CANCEL_RESET (oldtype); |