am b05c061e: am 4bc52758: Merge "Update epoll.h from bionic"

* commit 'b05c061e501ef35b6b988e5f1f99ecb670d01bbe':
  Update epoll.h from bionic
This commit is contained in:
Andrew Hsieh
2014-05-08 00:45:00 +00:00
committed by Android Git Automerger

View File

@@ -67,7 +67,11 @@ typedef union epoll_data {
struct epoll_event { struct epoll_event {
uint32_t events; uint32_t events;
epoll_data_t data; epoll_data_t data;
}; }
#ifdef __x86_64__
__packed
#endif
;
int epoll_create(int); int epoll_create(int);
int epoll_create1(int); int epoll_create1(int);