Bug 1386164 - Part 1. Use libevent2 headers instead of deprecated event.h. r?rjesup draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 03 Aug 2017 13:22:26 +0900
changeset 620142 f3c7f60107ba8611f6198f26162a0c426f784a28
parent 620112 d942ef54fdf726840a698d2ddcaf989d2c00edbc
child 620143 1cacb13ed23fda35a6b19de2394dc05fb87a9f76
push id71933
push userbmo:m_kato@ga2.so-net.ne.jp
push dateThu, 03 Aug 2017 04:36:42 +0000
reviewersrjesup
bugs1386164
milestone57.0a1
Bug 1386164 - Part 1. Use libevent2 headers instead of deprecated event.h. r?rjesup 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;