Bug 1386164 - Part 1. Use libevent2 headers instead of deprecated event.h. r=jesup
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 03 Aug 2017 13:22:26 +0900
changeset 422347 8ed89673594e26a7dc3914346be5778eddb15163
parent 422346 e79cd7f08b4f484ff41b44ba45a350783b16e855
child 422348 e1ab8bf0905dba63b4449344bad11b109d036747
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1386164
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1386164 - Part 1. Use libevent2 headers instead of deprecated event.h. r=jesup libevent uses event.h header that is fuzzy name. Since our in-tree libevent is libevent2, we should use libevent2 headers instead of deprecated event.h MozReview-Commit-ID: 6DjW9JEkNWL
config/system-headers
media/webrtc/trunk/webrtc/base/task_queue_libevent.cc
--- a/config/system-headers
+++ b/config/system-headers
@@ -1272,16 +1272,19 @@ libsn/sn-util.h
 hunspell.hxx
 #endif
 #if MOZ_SYSTEM_BZ2==1
 bzlib.h
 #endif
 gio/gio.h
 #if MOZ_SYSTEM_LIBEVENT==1
 event.h
+event2/event.h
+event2/event_compat.h
+event2/event_struct.h
 #else
 sys/event.h
 #endif
 #ifdef MOZ_ENABLE_LIBPROXY
 proxy.h
 #endif
 #ifdef MOZ_ENABLE_CONTENTMANAGER
 SelectSingleContentItemPage.h
--- a/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc
+++ b/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc
@@ -9,17 +9,19 @@
  */
 
 #include "webrtc/base/task_queue.h"
 
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "libevent/include/event.h"
+#include "event2/event.h"
+#include "event2/event_compat.h"
+#include "event2/event_struct.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/task_queue_posix.h"
 #include "webrtc/base/timeutils.h"
 
 namespace rtc {
 using internal::GetQueuePtrTls;
 using internal::AutoSetCurrentQueuePtr;