Bug 948777 - Build netwerk/sctp/src in unified mode; r=jesup
☠☠ backed out by 30e13828609f ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 12 Dec 2013 08:25:29 -0500
changeset 160226 a2e719af19a22d265644455b2a6ab0e8b5d6e4cb
parent 160225 576dcc23279514e96d204c1b32ec4f2891480356
child 160227 6d9cf51a012a74c503df861208f3188677a17673
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjesup
bugs948777
milestone29.0a1
Bug 948777 - Build netwerk/sctp/src in unified mode; r=jesup
netwerk/sctp/src/moz.build
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -5,44 +5,52 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_MODULE = 'necko_sctp'
 
 EXPORTS.mozilla.net += [
     'usrsctp.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'netinet/sctp_asconf.c',
     'netinet/sctp_auth.c',
     'netinet/sctp_bsd_addr.c',
     'netinet/sctp_callout.c',
     'netinet/sctp_cc_functions.c',
     'netinet/sctp_crc32.c',
     'netinet/sctp_hashdriver.c',
     'netinet/sctp_indata.c',
     'netinet/sctp_input.c',
-    'netinet/sctp_output.c',
     'netinet/sctp_pcb.c',
     'netinet/sctp_peeloff.c',
     'netinet/sctp_sha1.c',
     'netinet/sctp_ss_functions.c',
     'netinet/sctp_sysctl.c',
     'netinet/sctp_timer.c',
-    'netinet/sctp_userspace.c',
     'netinet/sctp_usrreq.c',
     'netinet/sctputil.c',
     'netinet6/sctp6_usrreq.c',
     'user_environment.c',
     'user_mbuf.c',
     'user_recv_thread.c',
     'user_sctp_timer_iterate.c',
+]
+
+# These files cannot be built in unified mode because they rely on __FAVOR_BSD in udp.h.
+SOURCES += [
+    'netinet/sctp_output.c',
     'user_socket.c',
 ]
 
+# This file cannot be built in unified mode because of compilation failures on Windows.
+SOURCES += [
+    'netinet/sctp_userspace.c',
+]
+
 if CONFIG['OS_TARGET'] == 'Android':
     SOURCES += [
         'ifaddrs_android.cpp',
     ]
 
 LIBRARY_NAME = 'nksctp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')