Merge pull request #1502 from jpf91/epoll-fix

Fix epoll_event for non-X86 architectures
dlang · Mar 6, 2016 · 4bfb1e9 · 4bfb1e9
2 parents ff4faa4 + c94547a
commit 4bfb1e9
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/src/core/sys/linux/epoll.d b/src/core/sys/linux/epoll.d
@@ -45,11 +45,35 @@ enum
     EPOLL_CTL_MOD = 3, // Change file descriptor epoll_event structure.
 }
 
-align(1) struct epoll_event
+version (X86)
 {
-align(1):
-    uint events;
-    epoll_data_t data;
+    align(1) struct epoll_event
+    {
+    align(1):
+        uint events;
+        epoll_data_t data;
+    }
+}
+else version (X86_64)
+{
+    align(1) struct epoll_event
+    {
+    align(1):
+        uint events;
+        epoll_data_t data;
+    }
+}
+else version (ARM)
+{
+    struct epoll_event
+    {
+        uint events;
+        epoll_data_t data;
+    }
+}
+else
+{
+    static assert(false, "Platform not supported");
 }
 
 union epoll_data_t