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

* commit '96dc8d3956ada4cef55797049e8c91dc5eb42c0d': Update epoll.h from bionic
2014-05-08 18:31:23 +00:00
parent e4e9dc65f1 96dc8d3956
commit 08f9413ce2
1 changed files with 5 additions and 1 deletions
--- a/ndk/platforms/android-20/include/sys/epoll.h
+++ b/ndk/platforms/android-20/include/sys/epoll.h
@@ -67,7 +67,11 @@ typedef union epoll_data {
 struct epoll_event {
  uint32_t events;
  epoll_data_t data;
-};
+}
+#ifdef __x86_64__
+__packed
+#endif
+;

 int epoll_create(int);
 int epoll_create1(int);