diff options
| author |   Joseph Myers <joseph@codesourcery.com> | 2012-08-07 23:03:35 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-08-07 23:03:35 +0000 |
| commit | 93df14eee81cf5514fe96e9143201a75d9391c7b (patch) | |
| tree | 240efc52c1b36d04a542037116e600d1e90d1079 /sysdeps/unix/sysv/linux/waitid.c | |
| parent | Move common dirent implementation from sysdeps/unix to sysdeps/posix. (diff) | |
| download | glibc-93df14eee81cf5514fe96e9143201a75d9391c7b.tar.gz glibc-93df14eee81cf5514fe96e9143201a75d9391c7b.tar.bz2 glibc-93df14eee81cf5514fe96e9143201a75d9391c7b.zip | |
Remove some pre-2.6.16 Linux kernel conditionals.
Diffstat (limited to 'sysdeps/unix/sysv/linux/waitid.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/waitid.c | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/sysdeps/unix/sysv/linux/waitid.c b/sysdeps/unix/sysv/linux/waitid.c index 7a8b6eb8b2..0fe6330392 100644 --- a/sysdeps/unix/sysv/linux/waitid.c +++ b/sysdeps/unix/sysv/linux/waitid.c @@ -1,5 +1,5 @@ /* Linux implementation of waitid. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004-2012 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 @@ -19,14 +19,8 @@ #include <stddef.h> #include <errno.h> #include <sys/wait.h> -#include <kernel-features.h> #include <sysdep.h> - -#ifdef __NR_waitid - -# if __ASSUME_WAITID_SYSCALL > 0 - static inline int do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) { @@ -34,37 +28,6 @@ do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) pass if we were using waitid to simulate wait3/wait4. */ return INLINE_SYSCALL (waitid, 5, idtype, id, infop, options, NULL); } -# define NO_DO_WAITID - -# else - -static int do_compat_waitid (idtype_t idtype, id_t id, - siginfo_t *infop, int options); -# define DO_WAITID do_compat_waitid - -static int -do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) -{ - static int waitid_works; - if (waitid_works > 0) - return INLINE_SYSCALL (waitid, 5, idtype, id, infop, options, NULL); - if (waitid_works == 0) - { - int result = INLINE_SYSCALL (waitid, 5, - idtype, id, infop, options, NULL); - if (result < 0 && errno == ENOSYS) - waitid_works = -1; - else - { - waitid_works = 1; - return result; - } - } - return do_compat_waitid (idtype, id, infop, options); -} - -# endif - -#endif +#define NO_DO_WAITID #include "sysdeps/posix/waitid.c" |