about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-12-27 20:44:44 -0500
committerRich Felker <dalias@aerifal.cx>2012-12-27 20:44:44 -0500
commit761ebe065ca75a2dda9407a1a31da273412525c6 (patch)
treeee11a0bd5454dadbd58a4f25b62f81d5240ef3d7
parent820fccdefe3774d2902f0191966a5c2848405faa (diff)
downloadmusl-761ebe065ca75a2dda9407a1a31da273412525c6.tar.gz
musl-761ebe065ca75a2dda9407a1a31da273412525c6.tar.xz
musl-761ebe065ca75a2dda9407a1a31da273412525c6.zip
align EPOLL_* flags with fcntl O_* flag definitions, which vary by arch
the old definitions were wrong on some archs. actually, EPOLL_NONBLOCK
probably should not even be defined; it is not accepted by the kernel
and it's not clear to me whether it has any use at all, even if it did
work. this issue should be revisited at some point, but I'm leaving it
in place for now in case some applications reference it.
-rw-r--r--include/sys/epoll.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sys/epoll.h b/include/sys/epoll.h
index 3530a9ac..0ff3d491 100644
--- a/include/sys/epoll.h
+++ b/include/sys/epoll.h
@@ -7,13 +7,14 @@ extern "C" {
 
 #include <stdint.h>
 #include <sys/types.h>
+#include <fcntl.h>
 
 #define __NEED_sigset_t
 
 #include <bits/alltypes.h>
 
-#define EPOLL_CLOEXEC 02000000
-#define EPOLL_NONBLOCK 04000
+#define EPOLL_CLOEXEC O_CLOEXEC
+#define EPOLL_NONBLOCK O_NONBLOCK
 
 enum EPOLL_EVENTS { __EPOLL_DUMMY };
 #define EPOLLIN 0x001