Bug 969715: remove INET and INET6 from sctp build env. r?jesup draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Thu, 08 Dec 2016 23:49:43 -1000
changeset 565406 1d656fd9ff6b65e3fe87bec09002ded6f8b76d32
parent 565261 a34919b3d942cfd4f0737d432742b0ffa9929389
child 624972 9859e0fc543e97659d82bf54433fa576f74832b4
push id54848
push userdrno@ohlmeier.org
push dateWed, 19 Apr 2017 20:24:12 +0000
reviewersjesup
bugs969715
milestone55.0a1
Bug 969715: remove INET and INET6 from sctp build env. r?jesup MozReview-Commit-ID: 4e67tOzltoc
media/mtransport/test/moz.build
netwerk/sctp/datachannel/moz.build
netwerk/sctp/src/moz.build
--- a/media/mtransport/test/moz.build
+++ b/media/mtransport/test/moz.build
@@ -23,27 +23,25 @@ if CONFIG['OS_TARGET'] != 'WINNT' and CO
     ]
 
     if CONFIG['MOZ_SCTP']:
         SOURCES += [
             'sctp_unittest.cpp',
         ]
 
 
-for var in ('HAVE_STRDUP', 'NR_SOCKET_IS_VOID_PTR', 'SCTP_DEBUG', 'INET'):
+for var in ('HAVE_STRDUP', 'NR_SOCKET_IS_VOID_PTR', 'SCTP_DEBUG'):
     DEFINES[var] = True
 
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['LINUX'] = True
     DEFINES['ANDROID'] = True
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/android/include',
     ]
-else:
-    DEFINES['INET6'] = True
 
 if CONFIG['OS_TARGET'] == 'Linux':
     DEFINES['LINUX'] = True
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/linux/include',
     ]
 
 if CONFIG['OS_TARGET'] == 'Darwin':
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -18,22 +18,18 @@ include('/ipc/chromium/chromium-config.m
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/media/mtransport',
     '/netwerk/sctp/src',
 ]
 
-DEFINES['INET'] = 1
 DEFINES['SCTP_DEBUG'] = 1
 
-if CONFIG['OS_TARGET'] != 'Android':
-    DEFINES['INET6'] = 1
-
 if CONFIG['OS_TARGET'] == 'WINNT':
     DEFINES['__Userspace_os_Windows'] = 1
 else:
     DEFINES['__Userspace_os_%s' % CONFIG['OS_TARGET']] = 1
 
 NO_PGO = True # Don't PGO
 
 if CONFIG['GNU_CXX']:
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -49,25 +49,20 @@ ALLOW_COMPILER_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/dom/base',
     '/netwerk/base',
 ]
 
 for var in ('SCTP_SIMPLE_ALLOCATOR',
-            'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET',
+            'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__',
             'CALLBACK_API', 'SCTP_DEBUG'):
     DEFINES[var] = 1
 
-# Android NDK r5c, used on the builders at the time of this writing, doesn't
-# have the headers we need for IPv6
-if CONFIG['OS_TARGET'] != 'Android':
-    DEFINES['INET6'] = 1
-
 if CONFIG['OS_TARGET'] == 'WINNT':
     DEFINES['__Userspace_os_Windows'] = 1
     DEFINES['_LIB'] = 1
 elif CONFIG['OS_TARGET'] == 'Android':
     DEFINES['__Userspace_os_Linux'] = 1
 else:
     DEFINES['__Userspace_os_%s' % CONFIG['OS_TARGET']] = 1