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
--- 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;