wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Makoto Kato 2015-08-03 10:07:09 +09:00
parent e861db37d3
commit 629ba560a7
26 changed files with 6 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accessible/windows/ia2/moz.build
View File

@ -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')

4
accessible/windows/sdn/moz.build
View File

@ -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

5
accessible/windows/uia/moz.build
View File

@ -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

3
dom/canvas/compiledtest/moz.build
View File

@ -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',
])

3
dom/canvas/moz.build
View File

@ -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',

3
dom/media/directshow/moz.build
View File

@ -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

3
dom/media/fmp4/moz.build
View File

@ -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

3
dom/media/platforms/agnostic/eme/moz.build
View File

@ -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

3
dom/media/platforms/moz.build
View File

@ -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

3
dom/media/platforms/wmf/moz.build
View File

@ -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']

3
dom/media/webrtc/moz.build
View File

@ -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 += [

1
gfx/angle/moz.build
View File

@ -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

1
gfx/angle/src/libEGL/moz.build
View File

@ -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

1
gfx/angle/src/libGLESv2/moz.build
View File

@ -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

1
gfx/ots/src/moz.build
View File

@ -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

1
ipc/chromium/chromium-config.mozbuild
View File

@ -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,

1
media/mtransport/common.build
View File

@ -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',
]

1
media/mtransport/test/moz.build
View File

@ -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.

2
security/sandbox/moz.build
View File

@ -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']

2
security/sandbox/staticruntime/moz.build
View File

@ -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']

3
security/sandbox/win/src/sandboxbroker/moz.build
View File

@ -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 += [

2
toolkit/crashreporter/breakpad-windows-libxul/moz.build
View File

@ -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 += [

2
toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build
View File

@ -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 += [

2
toolkit/crashreporter/breakpad-windows-standalone/moz.build
View File

@ -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 += [

2
toolkit/crashreporter/test/moz.build
View File

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

1
toolkit/mozapps/update/updater/updater-common.build
View File

@ -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