Bug 1049936 - Port |Bug 1046784 - move -DNOMINMAX definitions to moz.build| to comm-central r=standard8 a=for CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 13 Aug 2014 22:04:29 +0100
changeset 16653 e2bbde5251cf771c504b96d8aaa82e4a3e691a81
parent 16652 55ef732fc9617a7eacf7e6f9678ed6d284bf73c7
child 16654 7a18986c067151991f84deb11fcf98421cd1d8c4
push id10368
push useriann_cvs@blueyonder.co.uk
push dateWed, 13 Aug 2014 21:04:42 +0000
treeherdercomm-central@7ad2fba944f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8, for
bugs1049936, 1046784
Bug 1049936 - Port |Bug 1046784 - move -DNOMINMAX definitions to moz.build| to comm-central r=standard8 a=for CLOSED TREE
mailnews/addrbook/src/Makefile.in
mailnews/addrbook/src/moz.build
deleted file mode 100644
--- a/mailnews/addrbook/src/Makefile.in
+++ /dev/null
@@ -1,18 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifeq ($(OS_ARCH),WINNT)
-OS_CXXFLAGS += -DNOMINMAX
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -85,8 +85,10 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsAddrbook.manifest',
 ]
 
 FINAL_LIBRARY = 'mail'
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+    DEFINES['NOMINMAX'] = True