Bug 969932 - Remove unnecessary moz.build conditional for sendfile(2) on BSDs. r=glandium, a=NPOTB
authorJan Beich <jbeich@tormail.org>
Tue, 11 Feb 2014 09:22:46 -0500
changeset 176285 88806ebdaacd6dcbf8a14c01a54eb19b8bb44182
parent 176284 708e30a08b94b68cdf37bfa255d714c05b9688df
child 176286 5f7759dd5abae952126ef043d45ceccab7cc26a6
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, NPOTB
bugs969932
milestone28.0
Bug 969932 - Remove unnecessary moz.build conditional for sendfile(2) on BSDs. r=glandium, a=NPOTB
ipc/chromium/moz.build
ipc/chromium/src/third_party/libevent/bsd/event2/event-config.h
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -263,18 +263,16 @@ if os_bsd:
         ]
         GENERATED_SOURCES += [
             'src/base/moc_message_pump_qt.cc',
         ]
     if not CONFIG['MOZ_NATIVE_LIBEVENT']:
         SOURCES += [
             'src/third_party/libevent/kqueue.c',
         ]
-        if not os_freebsd and not os_dragonfly:
-            DEFINES['_EVENT_HAVE_SENDFILE'] = True
 
 if CONFIG['_MSC_VER']:
     SOURCES += [
         'src/base/debug_on_start.cc',
     ]
 
 ost = CONFIG['OS_TEST']
 if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1:
--- a/ipc/chromium/src/third_party/libevent/bsd/event2/event-config.h
+++ b/ipc/chromium/src/third_party/libevent/bsd/event2/event-config.h
@@ -179,17 +179,17 @@
 
 /* Define to 1 if the system has the type `sa_family_t'. */
 #define _EVENT_HAVE_SA_FAMILY_T 1
 
 /* Define to 1 if you have the `select' function. */
 #define _EVENT_HAVE_SELECT 1
 
 /* Define to 1 if you have the `sendfile' function. */
-/* #undef _EVENT_HAVE_SENDFILE */
+#define _EVENT_HAVE_SENDFILE 1
 
 /* Define to 1 if you have the `setenv' function. */
 #define _EVENT_HAVE_SETENV 1
 
 /* Define if F_SETFD is defined in <fcntl.h> */
 #define _EVENT_HAVE_SETFD 1
 
 /* Define to 1 if you have the `sigaction' function. */