diff -u third-party/folly/src/folly/io/async.orig/EventBase.cpp third-party/folly/src/folly/io/async/EventBase.cpp
--- third-party/folly/src/folly/io/async.orig/EventBase.cpp	2015-04-02 11:03:15.000000000 +0300
+++ third-party/folly/src/folly/io/async/EventBase.cpp	2015-04-02 11:03:24.897485534 +0300
@@ -732,7 +732,7 @@
   event_base_set(getLibeventBase(), ev);
   if (internal == AsyncTimeout::InternalEnum::INTERNAL) {
     // Set the EVLIST_INTERNAL flag
-    ev->ev_flags |= EVLIST_INTERNAL;
+    ev->ev_evcallback.evcb_flags |= EVLIST_INTERNAL;
   }
 }
 
diff -u third-party/folly/src/folly/io/async.orig/EventHandler.cpp third-party/folly/src/folly/io/async/EventHandler.cpp
--- third-party/folly/src/folly/io/async.orig/EventHandler.cpp	2015-04-02 11:03:59.000000000 +0300
+++ third-party/folly/src/folly/io/async/EventHandler.cpp	2015-04-02 11:07:07.917658678 +0300
@@ -50,7 +50,7 @@
     // If the new events are the same are the same as the already registered
     // flags, we don't have to do anything.  Just return.
     if (events == event_.ev_events &&
-        static_cast<bool>(event_.ev_flags & EVLIST_INTERNAL) == internal) {
+        static_cast<bool>(event_.ev_evcallback.evcb_flags & EVLIST_INTERNAL) == internal) {
       return true;
     }
 
@@ -67,7 +67,7 @@
 
   // Set EVLIST_INTERNAL if this is an internal event
   if (internal) {
-    event_.ev_flags |= EVLIST_INTERNAL;
+    event_.ev_evcallback.evcb_flags |= EVLIST_INTERNAL;
   }
 
   // Add the event.
@@ -159,7 +159,7 @@
 }
 
 bool EventHandler::isPending() const {
-  if (event_.ev_flags & EVLIST_ACTIVE) {
+  if (event_.ev_evcallback.evcb_flags & EVLIST_ACTIVE) {
     if (event_.ev_res & EV_READ) {
       return true;
     }

diff -u third-party/folly/src/folly/io/async.orig/EventUtil.h third-party/folly/src/folly/io/async/EventUtil.h
--- third-party/folly/src/folly/io/async.orig/EventUtil.h	2015-04-02 10:57:46.000000000 +0300
+++ third-party/folly/src/folly/io/async/EventUtil.h	2015-04-02 11:02:00.232590232 +0300
@@ -35,7 +35,7 @@
       EVLIST_REGISTERED = (EVLIST_INSERTED | EVLIST_ACTIVE |
                            EVLIST_TIMEOUT | EVLIST_SIGNAL)
     };
-    return (ev->ev_flags & EVLIST_REGISTERED);
+    return (ev->ev_evcallback.evcb_flags & EVLIST_REGISTERED);
   }
 };