diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-08 09:10:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-08 09:10:31 +0200 |
| commit | b38f6240891f78af59e2c5d25361ab67a73e000f (patch) | |
| tree | 5b0f26e946da82519e4703eceeae007cd3c39e57 /libc/sysdeps/linux/common/epoll.c | |
| parent | 36043b37739dffdaea8d31457570810e492268d7 (diff) | |
| parent | 7efe10ec5fc772f5328b35ba6716bde815212b45 (diff) | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'libc/sysdeps/linux/common/epoll.c')
| -rw-r--r-- | libc/sysdeps/linux/common/epoll.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c index 5f1e589e9..d7b7ca7b3 100644 --- a/libc/sysdeps/linux/common/epoll.c +++ b/libc/sysdeps/linux/common/epoll.c @@ -11,36 +11,28 @@ #include <sys/epoll.h> #include <cancel.h> -#ifdef __NR_epoll_create +#ifdef L_epoll_create +# ifdef __NR_epoll_create _syscall1(int, epoll_create, int, size) -#endif +# endif -#ifdef __NR_epoll_create1 +# ifdef __NR_epoll_create1 _syscall1(int, epoll_create1, int, flags) -#endif +# endif -#if defined __NR_epoll_create1 && !defined __NR_epoll_create +# if defined __NR_epoll_create1 && !defined __NR_epoll_create int epoll_create(int size) { return INLINE_SYSCALL(epoll_create1, 1, 0); } - +# endif #endif -#ifdef __NR_epoll_ctl +#if defined L_epoll_ctl && defined __NR_epoll_ctl _syscall4(int, epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, event) #endif -#ifdef __NR_epoll_wait -static int __NC(epoll_wait)(int epfd, struct epoll_event *events, int maxevents, int timeout) -{ - return INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, timeout); -} -CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int maxevents, int timeout), - (epfd, events, maxevents, timeout)) -#endif - -#ifdef __NR_epoll_pwait +#if defined L_epoll_pwait && defined __NR_epoll_pwait # include <signal.h> # define __NR___syscall_epoll_pwait __NR_epoll_pwait @@ -55,11 +47,23 @@ static int __NC(epoll_pwait)(int epfd, struct epoll_event *events, int maxevents CANCELLABLE_SYSCALL(int, epoll_pwait, (int epfd, struct epoll_event *events, int maxevents, int timeout, const sigset_t *set), (epfd, events, maxevents, timeout, set)) +#endif + +#if defined L_epoll_wait +# if defined __NR_epoll_wait +static int __NC(epoll_wait)(int epfd, struct epoll_event *events, int maxevents, int timeout) +{ + return INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, timeout); +} +CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int maxevents, int timeout), + (epfd, events, maxevents, timeout)) + + +# elif /* !defined L_epoll_wait && */ defined __NR_epoll_pwait /* * If epoll_wait is not defined, then call epoll_pwait instead using NULL * for sigmask argument */ -# ifndef __NR_epoll_wait # include <stddef.h> int epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) { |