commit 6dbb1148210e Author: Mike Hommey Date: Sun Nov 20 17:51:17 2016 +0900 Bug 1318914 - Fix --with-system-libevent build against libevent 2.1. r=billm --HG-- extra : rebase_source : da25767f6045507447f90ab03291c60a4f2c6b3d --- ipc/chromium/src/base/message_pump_libevent.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git ipc/chromium/src/base/message_pump_libevent.cc ipc/chromium/src/base/message_pump_libevent.cc index 2db827e5bade..3cca238c1e7c 100644 --- ipc/chromium/src/base/message_pump_libevent.cc +++ ipc/chromium/src/base/message_pump_libevent.cc @@ -22,9 +22,17 @@ // This macro checks that the _EVENT_SIZEOF_* constants defined in // ipc/chromiume/src/third_party//event2/event-config.h are correct. +#if defined(_EVENT_SIZEOF_SHORT) #define CHECK_EVENT_SIZEOF(TYPE, type) \ static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \ "bad _EVENT_SIZEOF_"#TYPE); +#elif defined(EVENT__SIZEOF_SHORT) +#define CHECK_EVENT_SIZEOF(TYPE, type) \ + static_assert(EVENT__SIZEOF_##TYPE == sizeof(type), \ + "bad EVENT__SIZEOF_"#TYPE); +#else +#error Cannot find libevent type sizes +#endif CHECK_EVENT_SIZEOF(LONG, long); CHECK_EVENT_SIZEOF(LONG_LONG, long long);