commit cac7b9d6ec1a09814bc028e2f768db732f018891
author Elliott Hughes <enh@google.com> Wed Oct 23 09:48:29 2013 -0700
committer Elliott Hughes <enh@google.com> Wed Oct 23 09:48:29 2013 -0700
tree 3278eba969b89888065d93f36be63eb68f463242
parent ec40edc9188aebe5207e47c0a66e89e1ed368bd6

Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls.

(aarch64 kernels only have the newer system calls.)

Also expose the new functionality that's exposed by glibc in our header files.

Change-Id: I45d2d168a03f88723d1f7fbf634701006a4843c5

libc/include/sys/epoll.h

diff --git a/libc/include/sys/epoll.h b/libc/include/sys/epoll.h
index 38739aa..625f4c2 100644
--- a/libc/include/sys/epoll.h
+++ b/libc/include/sys/epoll.h
@@ -29,6 +29,7 @@
 #define _SYS_EPOLL_H_
 
 #include <sys/cdefs.h>
+#include <asm/fcntl.h> /* For O_CLOEXEC. */
 
 __BEGIN_DECLS
 
@@ -51,7 +52,9 @@
 #define EPOLL_CTL_DEL    2
 #define EPOLL_CTL_MOD    3
 
-typedef union epoll_data 
+#define EPOLL_CLOEXEC O_CLOEXEC
+
+typedef union epoll_data
 {
     void *ptr;
     int fd;
@@ -59,17 +62,17 @@
     unsigned long long u64;
 } epoll_data_t;
 
-struct epoll_event 
+struct epoll_event
 {
     unsigned int events;
     epoll_data_t data;
 };
 
 int epoll_create(int size);
+int epoll_create1(int flags);
 int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event);
 int epoll_wait(int epfd, struct epoll_event *events, int max, int timeout);
 
 __END_DECLS
 
 #endif  /* _SYS_EPOLL_H_ */
-

libc/include/sys/eventfd.h

diff --git a/libc/include/sys/eventfd.h b/libc/include/sys/eventfd.h
index ec84e27..4c8da0c 100644
--- a/libc/include/sys/eventfd.h
+++ b/libc/include/sys/eventfd.h
@@ -25,6 +25,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #ifndef _SYS_EVENTFD_H
 #define _SYS_EVENTFD_H
 

libc/include/sys/inotify.h

diff --git a/libc/include/sys/inotify.h b/libc/include/sys/inotify.h
index 33f9e74..a88cdee 100644
--- a/libc/include/sys/inotify.h
+++ b/libc/include/sys/inotify.h
@@ -29,14 +29,19 @@
 #define _SYS_INOTIFY_H_
 
 #include <sys/cdefs.h>
-#include <sys/types.h>
+#include <stdint.h>
 #include <linux/inotify.h>
+#include <asm/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK. */
 
 __BEGIN_DECLS
 
+#define IN_CLOEXEC O_CLOEXEC
+#define IN_NONBLOCK O_NONBLOCK
+
 extern int inotify_init(void);
-extern int inotify_add_watch(int, const char *, __u32);
-extern int inotify_rm_watch(int, __u32);
+extern int inotify_init1(int);
+extern int inotify_add_watch(int, const char*, uint32_t);
+extern int inotify_rm_watch(int, uint32_t);
 
 __END_DECLS