author | Nathan Froyd <froydnj@mozilla.com> |
Thu, 31 Jul 2014 10:41:48 -0400 | |
changeset 197382 | 26d8874e7fdcc07d10f8d8714fb3ba3472f49b7a |
parent 197381 | c927f8b6a7b549717ea48c86e507a8a36fa8ec94 |
child 197383 | 150cdebe837ff68628842b6350c96eea73c91e15 |
push id | 27241 |
push user | ryanvm@gmail.com |
push date | Fri, 01 Aug 2014 19:59:32 +0000 |
treeherder | mozilla-central@3fb88a727814 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mshal |
bugs | 1046784 |
milestone | 34.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
accessible/windows/ia2/Makefile.in | file | annotate | diff | comparison | revisions | |
accessible/windows/ia2/moz.build | file | annotate | diff | comparison | revisions | |
accessible/windows/uia/Makefile.in | file | annotate | diff | comparison | revisions | |
accessible/windows/uia/moz.build | file | annotate | diff | comparison | revisions | |
content/media/directshow/Makefile.in | file | annotate | diff | comparison | revisions | |
content/media/directshow/moz.build | file | annotate | diff | comparison | revisions | |
content/media/fmp4/Makefile.in | file | annotate | diff | comparison | revisions | |
content/media/fmp4/moz.build | file | annotate | diff | comparison | revisions | |
content/media/wmf/Makefile.in | file | annotate | diff | comparison | revisions | |
content/media/wmf/moz.build | file | annotate | diff | comparison | revisions |
deleted file mode 100644 --- a/accessible/windows/ia2/Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# The midl generated code include Windows headers which defines min and max -# macros which conflicts with std::min/max. Suppress the macros: -OS_CXXFLAGS += -DNOMINMAX - -include $(topsrcdir)/config/rules.mk
--- a/accessible/windows/ia2/moz.build +++ b/accessible/windows/ia2/moz.build @@ -40,8 +40,13 @@ LOCAL_INCLUDES += [ '/accessible/generic', '/accessible/html', '/accessible/windows/msaa', '/accessible/xpcom', '/accessible/xul', ] 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
deleted file mode 100644 --- a/accessible/windows/uia/Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# The midl generated code include Windows headers which defines min and max -# macros which conflicts with std::min/max. Suppress the macros: -OS_CXXFLAGS += -DNOMINMAX - -include $(topsrcdir)/config/rules.mk
--- a/accessible/windows/uia/moz.build +++ b/accessible/windows/uia/moz.build @@ -13,8 +13,13 @@ LOCAL_INCLUDES += [ '/accessible/generic', '/accessible/html', '/accessible/windows/msaa', '/accessible/xpcom', '/accessible/xul', ] 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
deleted file mode 100644 --- a/content/media/directshow/Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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_ARCH),WINNT) -OS_CXXFLAGS += -DNOMINMAX -endif
--- a/content/media/directshow/moz.build +++ b/content/media/directshow/moz.build @@ -37,8 +37,10 @@ if not CONFIG['MOZ_WEBRTC']: FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/media/webrtc/trunk/webrtc/modules/video_capture/windows', ] +if CONFIG['OS_ARCH'] == 'WINNT': + DEFINES['NOMINMAX'] = True
deleted file mode 100644 --- a/content/media/fmp4/Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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_ARCH),WINNT) -OS_CXXFLAGS += -DNOMINMAX -endif
--- a/content/media/fmp4/moz.build +++ b/content/media/fmp4/moz.build @@ -56,8 +56,11 @@ if CONFIG['MOZ_APPLEMEDIA']: ] LDFLAGS += [ '-framework AudioToolbox', ] FINAL_LIBRARY = 'xul' FAIL_ON_WARNINGS = True + +if CONFIG['OS_ARCH'] == 'WINNT': + DEFINES['NOMINMAX'] = True
deleted file mode 100644 --- a/content/media/wmf/Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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_ARCH),WINNT) -OS_CXXFLAGS += -DNOMINMAX -endif