Bug 687389 - Fix MSVC 2010 warning C4005: '_WIN32_WINNT' : macro redefinition, for various files under accessible/public/*; r=khuey
authorEd Morley <bmo@edmorley.co.uk>
Thu, 22 Sep 2011 21:54:57 +0100
changeset 78663 0c47234a402129649f1012e38a67eb70a05ad332
parent 78662 f829841e66189806c65776b1d4e129fcdaf9b954
child 78664 875cb4f20eac2544dc1d3249ed7cffe4e3962f63
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs687389
milestone9.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
Bug 687389 - Fix MSVC 2010 warning C4005: '_WIN32_WINNT' : macro redefinition, for various files under accessible/public/*; r=khuey
accessible/public/ia2/Makefile.in
accessible/public/msaa/Makefile.in
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -44,17 +44,17 @@ LIBRARY_NAME  = IA2Marshal
 MODULE        = accessibility
 GRE_MODULE    = 1
 DEFFILE       = $(win_srcdir)/IA2Marshal.def
 
 IA2DIR        = $(topsrcdir)/other-licenses/ia2
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES       += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
+DEFINES       += -DREGISTER_PROXY_DLL
 
 GARBAGE       += $(MIDL_GENERATED_FILES)
 
 FORCE_SHARED_LIB = 1
 
 SRCS_IN_OBJDIR   = 1
 
 MIDL_INTERFACES = \
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -48,17 +48,17 @@ DEFFILE = $(win_srcdir)/AccessibleMarsha
 
 include $(DEPTH)/config/autoconf.mk
 
 XPIDLSRCS = \
       nsIAccessibleWin32Object.idl \
       nsIWinAccessNode.idl \
       $(NULL)
 
-DEFINES		+= -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
+DEFINES += -DREGISTER_PROXY_DLL
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
 
 FORCE_SHARED_LIB = 1
 
 SRCS_IN_OBJDIR	= 1
 
 CSRCS	= \