Bug 976443 - Move undefines to moz.build; r=glandium

netwerk/sctp/src/Makefile.in

@@ -3,38 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-ifeq ($(OS_TARGET),Darwin)
-DEFINES += \
-  -U__APPLE__ \
-  $(NULL)
-else
-ifeq ($(OS_TARGET),FreeBSD)
-DEFINES += \
-  -U__FreeBSD__ \
-  $(NULL)
-else
-ifeq ($(OS_TARGET),NetBSD)
-DEFINES += \
-  -U__NetBSD__ \
-  $(NULL)
-else
-ifeq ($(OS_TARGET),OpenBSD)
-DEFINES += \
-  -U__OpenBSD__ \
-  $(NULL)
-else
-ifeq ($(OS_TARGET),DragonFly)
-DEFINES += \
-  -U__DragonFly__ \
-  $(NULL)
-else
-#error Unsupported platform!
-endif
-endif
-endif
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC

netwerk/sctp/src/moz.build

@@ -74,9 +74,22 @@ else:
 
 if CONFIG['OS_TARGET'] == 'Darwin':
     DEFINES['__APPLE_USE_RFC_2292'] = 1
+    DEFINES['__APPLE__'] = False
 
 if CONFIG['OS_TARGET'] in ('Linux', 'Android'):
     # to make sure that in6_pktinfo gets defined on all distros
     DEFINES['_GNU_SOURCE'] = True
 
+if CONFIG['OS_TARGET'] == 'FreeBSD':
+    DEFINES['__FreeBSD__'] = False
+
+if CONFIG['OS_TARGET'] == 'NetBSD':
+    DEFINES['__NetBSD__'] = False
+
+if CONFIG['OS_TARGET'] == 'OpenBSD':
+    DEFINES['__OpenBSD__'] = False
+
+if CONFIG['OS_TARGET'] == 'DragonFly':
+    DEFINES['__DragonFly__'] = False
+
 NO_PGO = True # Don't PGO