diff --git a/accessible/windows/ia2/moz.build b/accessible/windows/ia2/moz.build index 7c593cf85f8..43499cfe83c 100644 --- a/accessible/windows/ia2/moz.build +++ b/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') diff --git a/accessible/windows/sdn/moz.build b/accessible/windows/sdn/moz.build index 9dba32e8378..4cdf63d565d 100644 --- a/accessible/windows/sdn/moz.build +++ b/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 diff --git a/accessible/windows/uia/moz.build b/accessible/windows/uia/moz.build index c50e5280712..df904b3af08 100644 --- a/accessible/windows/uia/moz.build +++ b/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 diff --git a/dom/canvas/compiledtest/moz.build b/dom/canvas/compiledtest/moz.build index e0728e373d0..c8a6c0fbc34 100644 --- a/dom/canvas/compiledtest/moz.build +++ b/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', ]) diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build index d8384e884f5..140a1ce25ef 100644 --- a/dom/canvas/moz.build +++ b/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', diff --git a/dom/media/directshow/moz.build b/dom/media/directshow/moz.build index 11e71544ac4..e658ff39594 100644 --- a/dom/media/directshow/moz.build +++ b/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 diff --git a/dom/media/fmp4/moz.build b/dom/media/fmp4/moz.build index 54166c5647c..29deb6781a0 100644 --- a/dom/media/fmp4/moz.build +++ b/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 diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index 57224c1ef04..a73d33891b2 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/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 diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build index c06cb92d727..42e9a4f03fa 100644 --- a/dom/media/platforms/moz.build +++ b/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 diff --git a/dom/media/platforms/wmf/moz.build b/dom/media/platforms/wmf/moz.build index 25f51071900..54de727030e 100644 --- a/dom/media/platforms/wmf/moz.build +++ b/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'] diff --git a/dom/media/webrtc/moz.build b/dom/media/webrtc/moz.build index 56bc112b7eb..7452d8d94ac 100644 --- a/dom/media/webrtc/moz.build +++ b/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 += [ diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build index adefe8d3b71..a6436441e84 100644 --- a/gfx/angle/moz.build +++ b/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 diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build index 6ab700d26dd..0bbcb836d51 100644 --- a/gfx/angle/src/libEGL/moz.build +++ b/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 diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build index 5795f3817e6..3cb95181d35 100644 --- a/gfx/angle/src/libGLESv2/moz.build +++ b/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 diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build index 9575c0f17d3..d1bd140d8b0 100644 --- a/gfx/ots/src/moz.build +++ b/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 diff --git a/ipc/chromium/chromium-config.mozbuild b/ipc/chromium/chromium-config.mozbuild index 3cf4f52e2a9..53bd38348dc 100644 --- a/ipc/chromium/chromium-config.mozbuild +++ b/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, diff --git a/media/mtransport/common.build b/media/mtransport/common.build index 0d441f79c88..5184f2aa1c1 100644 --- a/media/mtransport/common.build +++ b/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', ] diff --git a/media/mtransport/test/moz.build b/media/mtransport/test/moz.build index fedd1fc77f9..de6a1f7e939 100644 --- a/media/mtransport/test/moz.build +++ b/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. diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build index c45c1c252dd..9fb6d727d05 100644 --- a/security/sandbox/moz.build +++ b/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'] diff --git a/security/sandbox/staticruntime/moz.build b/security/sandbox/staticruntime/moz.build index 708fd344fd3..ee583b2488f 100644 --- a/security/sandbox/staticruntime/moz.build +++ b/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'] diff --git a/security/sandbox/win/src/sandboxbroker/moz.build b/security/sandbox/win/src/sandboxbroker/moz.build index 076f0adb737..c90d9ebf6c5 100644 --- a/security/sandbox/win/src/sandboxbroker/moz.build +++ b/security/sandbox/win/src/sandboxbroker/moz.build @@ -19,8 +19,7 @@ EXPORTS += [ 'sandboxBroker.h', ] -for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'NOMINMAX', - 'SANDBOX_EXPORTS'): +for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS'): DEFINES[var] = True LOCAL_INCLUDES += [ diff --git a/toolkit/crashreporter/breakpad-windows-libxul/moz.build b/toolkit/crashreporter/breakpad-windows-libxul/moz.build index d638b4ef0f1..122f96611f5 100644 --- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build +++ b/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 += [ diff --git a/toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build b/toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build index f7b45f2ecb2..edaa26c66ad 100644 --- a/toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build +++ b/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 += [ diff --git a/toolkit/crashreporter/breakpad-windows-standalone/moz.build b/toolkit/crashreporter/breakpad-windows-standalone/moz.build index 3e2917657c9..89b35a43fe5 100644 --- a/toolkit/crashreporter/breakpad-windows-standalone/moz.build +++ b/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 += [ diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build index b27079f2b9e..ca1db0bff40 100644 --- a/toolkit/crashreporter/test/moz.build +++ b/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/', ] diff --git a/toolkit/mozapps/update/updater/updater-common.build b/toolkit/mozapps/update/updater/updater-common.build index ae1d680a630..a39d47d8801 100644 --- a/toolkit/mozapps/update/updater/updater-common.build +++ b/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