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

* commit '4bc5275825af47e11479b2cbff01193e90ca2ff4': Update epoll.h from bionic
2014-05-08 00:42:39 +00:00
parent bde50dcb0c 4bc5275825
commit b05c061e50
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);