Bug 830801 - Part 2. Remove NOMINMAX define from moz.build. r=mshal

accessible/windows/ia2/moz.build

@@ -47,11 +47,6 @@ LOCAL_INCLUDES += [
 
 FINAL_LIBRARY = 'xul'
 
-# The midl generated code include Windows headers which defines min and max
-# macros which conflicts with std::min/max.  Suppress the macros:
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True
-
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')

accessible/windows/sdn/moz.build

@@ -19,10 +19,6 @@ LOCAL_INCLUDES += [
     '/accessible/xul',
 ]
 
-# The midl generated code include Windows headers which defines min and max
-# macros which conflicts with std::min/max.  Suppress the macros:
-DEFINES['NOMINMAX'] = True
-
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True

accessible/windows/uia/moz.build

@@ -19,9 +19,4 @@ LOCAL_INCLUDES += [
 
 FINAL_LIBRARY = 'xul'
 
-# The midl generated code include Windows headers which defines min and max
-# macros which conflicts with std::min/max.  Suppress the macros:
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True
-
 FAIL_ON_WARNINGS = True

dom/canvas/compiledtest/moz.build

@@ -4,9 +4,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/.
 
-# http://support.microsoft.com/kb/143208
-DEFINES['NOMINMAX'] = True
-
 GeckoCppUnitTests([
     'TestWebGLElementArrayCache',
 ])

dom/canvas/moz.build

@@ -36,9 +36,6 @@ EXPORTS.mozilla.dom += [
     'WebGLVertexArrayObject.h',
 ]
 
-# http://support.microsoft.com/kb/143208
-DEFINES['NOMINMAX'] = True
-
 # Canvas 2D and common sources
 UNIFIED_SOURCES += [
     'CanvasImageCache.cpp',

dom/media/directshow/moz.build

@@ -41,6 +41,3 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
 ]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True

dom/media/fmp4/moz.build

@@ -23,8 +23,5 @@ FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True
-
 if CONFIG['MOZ_GONK_MEDIACODEC']:
     DEFINES['MOZ_GONK_MEDIACODEC'] = True

dom/media/platforms/agnostic/eme/moz.build

@@ -23,6 +23,3 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True

dom/media/platforms/moz.build

@@ -82,6 +82,3 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True

dom/media/platforms/wmf/moz.build

@@ -31,9 +31,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True
-
 FAIL_ON_WARNINGS = True
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

dom/media/webrtc/moz.build

@@ -83,9 +83,6 @@ if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
   ]
 
 FINAL_LIBRARY = 'xul'
-if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFINES['NOMINMAX'] = True
-
 
 if CONFIG['_MSC_VER']:
   CXXFLAGS += [

gfx/angle/moz.build

@@ -98,7 +98,6 @@ if CONFIG['GNU_CXX']:
 if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']]
 
-DEFINES['NOMINMAX'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 

gfx/angle/src/libEGL/moz.build

@@ -30,7 +30,6 @@ if CONFIG['GNU_CXX']:
 if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']]
 
-DEFINES['NOMINMAX'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 

gfx/angle/src/libGLESv2/moz.build

@@ -193,7 +193,6 @@ if CONFIG['GNU_CXX']:
 if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
     CXXFLAGS += ['-I\'%s/include/\'' % CONFIG['MOZ_DIRECTX_SDK_PATH']]
 
-DEFINES['NOMINMAX'] = True
 DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 

gfx/ots/src/moz.build

@@ -54,7 +54,6 @@ FINAL_LIBRARY = 'gkmedias'
 
 DEFINES['PACKAGE_VERSION'] = '"moz"'
 DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'
-DEFINES['NOMINMAX'] = True
 
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     DEFINES['OTS_DLL'] = True

ipc/chromium/chromium-config.mozbuild

@@ -23,7 +23,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES.update({
         'UNICODE': True,
         '_UNICODE': True,
-        'NOMINMAX': True,
         '_CRT_RAND_S': True,
         'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS': True,
         '_SECURE_ATL': True,

media/mtransport/common.build

@@ -77,7 +77,6 @@ elif CONFIG['OS_TARGET'] == 'WINNT':
     DEFINES['WIN'] = True
     # for stun.h
     DEFINES['WIN32'] = True
-    DEFINES['NOMINMAX'] = True
     LOCAL_INCLUDES += [
         '/media/mtransport/third_party/nrappkit/src/port/win32/include',
     ]

media/mtransport/test/moz.build

@@ -72,7 +72,6 @@ if CONFIG['OS_TARGET'] == 'WINNT':
     DEFINES['WIN'] = True
     # for stun.h
     DEFINES['WIN32'] = True
-    DEFINES['NOMINMAX'] = True
     DEFINES['__Userspace_os_Windows'] = 1
 else:
     # Works for Darwin, Linux, Android. Probably doesn't work for others.

security/sandbox/moz.build

@@ -39,7 +39,7 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
         SOURCES['/security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.cc'].no_pgo = True
 
     for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
-                'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
+                '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
     LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']

security/sandbox/staticruntime/moz.build

@@ -17,7 +17,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         SOURCES['/security/sandbox/chromium/sandbox/win/src/sharedmem_ipc_client.cc'].no_pgo = True
 
     for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
-                'NOMINMAX', '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
+                '_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
         DEFINES[var] = True
 
     LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']

security/sandbox/win/src/sandboxbroker/moz.build

@@ -19,8 +19,7 @@ EXPORTS += [
     'sandboxBroker.h',
 ]
 
-for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'NOMINMAX',
+for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS'):
-            'SANDBOX_EXPORTS'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [

toolkit/crashreporter/breakpad-windows-libxul/moz.build

@@ -16,7 +16,7 @@ Library('google_breakpad_libxul_s')
 
 FINAL_LIBRARY = 'xul'
 
-for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
+for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [

toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build

@@ -10,7 +10,7 @@ SOURCES += [
 
 Library('google_breakpad_libxul_staticruntime_s')
 
-for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
+for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [

toolkit/crashreporter/breakpad-windows-standalone/moz.build

@@ -6,7 +6,7 @@
 
 FINAL_LIBRARY = 'breakpadinjector'
 
-for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
+for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD'):
     DEFINES[var] = True
 
 LOCAL_INCLUDES += [

toolkit/crashreporter/test/moz.build

@@ -29,8 +29,6 @@ DEFINES['SHARED_LIBRARY'] = '%s%s%s' % (
     CONFIG['DLL_SUFFIX']
 )
 
-DEFINES['NOMINMAX'] = True
-
 LOCAL_INCLUDES += [
     '../google-breakpad/src/',
 ]

toolkit/mozapps/update/updater/updater-common.build

@@ -27,7 +27,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     RCINCLUDE = '%supdater.rc' % updater_rel_path
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
-    DEFINES['NOMINMAX'] = True
     USE_STATIC_LIBS = True
 
     # Pick up nsWindowsRestart.cpp