Define WIN32_LEAN_AND_MEAN globally for win32 builds.

Thanks to Stephen Walker <walk84@yahoo.com> for the patch. Bug #172898 r=cls a=asa
2002-10-17 06:47:01 +00:00 · 2002-10-17 06:47:01 +00:00 · 57e08a3f3a
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -109,10 +109,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 INCLUDES	+= \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../html/base/src \
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -60,10 +60,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= -I$(srcdir)/../../html/base/src \
             -I$(srcdir)/../../xul/content/src \
             $(NULL)
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -128,10 +128,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 INCLUDES	+= \
 		-I$(srcdir)/../../style/src \
 		-I$(srcdir)/../../../base/src \
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -78,10 +78,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
--- a/content/html/style/src/Makefile.in
+++ b/content/html/style/src/Makefile.in
@ -96,10 +96,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
--- a/content/shared/src/Makefile.in
+++ b/content/shared/src/Makefile.in
@ -67,7 +67,3 @@ endif
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -94,10 +94,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/style/src \
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -64,10 +64,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../xsl/document/src \
--- a/content/xsl/document/src/Makefile.in
+++ b/content/xsl/document/src/Makefile.in
@ -38,10 +38,6 @@ REQUIRES	= xpcom \

 include $(topsrcdir)/config/config.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES	+= -DWIN32_LEAN_AND_MEAN
-endif
-
 CPPSRCS =				\
 	nsXSLContentSink.cpp			\
 	nsTransformMediator.cpp			\
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@ -62,10 +62,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 	-I$(srcdir) \
 	-I$(srcdir)/../../document/src \
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -71,10 +71,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		   -I$(srcdir)/../../content/src \
 		   -I$(srcdir)/../../templates/src \
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@ -78,10 +78,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		   -I$(srcdir)/../../content/src \
 		   $(NULL)
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -88,7 +88,3 @@ ifdef NS_TRACE_MALLOC
 DEFINES		+= -DNS_TRACE_MALLOC
 endif

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -49,7 +49,3 @@ include $(topsrcdir)/config/rules.mk

 INCLUDES	+= -I$(srcdir)/../base

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/embedding/browser/activex/src/control/HelperAppDlg.cpp
+++ b/embedding/browser/activex/src/control/HelperAppDlg.cpp
@ -41,6 +41,9 @@

 #include <commctrl.h>

+// commdlg.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <commdlg.h>
+
 #include "HelperAppDlg.h"

 #include "nsCOMPtr.h"
--- a/embedding/browser/activex/src/control/MozillaBrowser.cpp
+++ b/embedding/browser/activex/src/control/MozillaBrowser.cpp
@ -43,6 +43,9 @@
 //#include <comdef.h>
 #include <shlobj.h>

+// commdlg.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <commdlg.h>
+
 #include "MozillaControl.h"
 #include "MozillaBrowser.h"
 #include "IEHtmlDocument.h"
--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@ -152,8 +152,6 @@ ifdef MOZ_ACTIVEX_PLUGIN_WMPSUPPORT
 CPPSRCS += XPCMediaPlayer.cpp
 endif

-DEFINES += -DWIN32_LEAN_AND_MEAN
-
 LOCAL_INCLUDES = -I$(MOZCTLSRC)

 ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@ -112,7 +112,3 @@ EXTRA_DSO_LDOPTS += \
 endif

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES	+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/embedding/tests/mfcembed/components/Makefile.in
+++ b/embedding/tests/mfcembed/components/Makefile.in
@ -77,7 +77,7 @@ FORCE_SHARED_LIB = 1

 include $(topsrcdir)/config/rules.mk

-CXXFLAGS	+= /D "WIN32_LEAN_AND_MEAN" /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" /D "_WINDLL"
+CXXFLAGS	+= /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" /D "_WINDLL"
 LDFLAGS		+= -SUBSYSTEM:windows

 Dialogs.res: Dialogs.rc resource.h
--- a/embedding/tests/winEmbed/StdAfx.h
+++ b/embedding/tests/winEmbed/StdAfx.h
@ -39,8 +39,6 @@
 #pragma once
 #endif // _MSC_VER > 1000

-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-

 // Windows Header Files:
 #include <windows.h>
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@ -90,7 +90,3 @@ EXTRA_DSO_LDOPTS = \

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/extensions/cookie/tests/Makefile.in
+++ b/extensions/cookie/tests/Makefile.in
@ -43,7 +43,3 @@ endif

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/extensions/inspector/base/src/Makefile.in
+++ b/extensions/inspector/base/src/Makefile.in
@ -71,7 +71,3 @@ endif
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/inspector/base/src/win/Makefile.in
+++ b/extensions/inspector/base/src/win/Makefile.in
@ -47,7 +47,3 @@ LOCAL_INCLUDES	= -I$(srcdir)/..
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/interfaceinfo/src/Makefile.in
+++ b/extensions/interfaceinfo/src/Makefile.in
@ -70,7 +70,3 @@ EXTRA_COMPONENTS = nsInterfaceInfoToIDL.js

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/extensions/universalchardet/src/Makefile.in
+++ b/extensions/universalchardet/src/Makefile.in
@ -77,5 +77,5 @@ EXTRA_DSO_LDOPTS += \
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN -D__STDC__
+DEFINES		+= -D__STDC__
 endif
--- a/extensions/webservices/interfaceinfo/src/Makefile.in
+++ b/extensions/webservices/interfaceinfo/src/Makefile.in
@ -70,7 +70,3 @@ EXTRA_COMPONENTS = nsInterfaceInfoToIDL.js

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/extensions/webservices/schema/src/Makefile.in
+++ b/extensions/webservices/schema/src/Makefile.in
@ -56,7 +56,3 @@ CPPSRCS	= 				\
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/webservices/soap/src/Makefile.in
+++ b/extensions/webservices/soap/src/Makefile.in
@ -74,7 +74,3 @@ CPPSRCS        =                                 \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES                += -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/webservices/wsdl/src/Makefile.in
+++ b/extensions/webservices/wsdl/src/Makefile.in
@ -54,7 +54,3 @@ LOCAL_INCLUDES	= \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/xmlextras/base/src/Makefile.in
+++ b/extensions/xmlextras/base/src/Makefile.in
@ -58,7 +58,3 @@ CPPSRCS	= 				\
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/xmlextras/interfaceinfo/src/Makefile.in
+++ b/extensions/xmlextras/interfaceinfo/src/Makefile.in
@ -70,7 +70,3 @@ EXTRA_COMPONENTS = nsInterfaceInfoToIDL.js

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/extensions/xmlextras/schema/src/Makefile.in
+++ b/extensions/xmlextras/schema/src/Makefile.in
@ -56,7 +56,3 @@ CPPSRCS	= 				\
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/xmlextras/soap/src/Makefile.in
+++ b/extensions/xmlextras/soap/src/Makefile.in
@ -74,7 +74,3 @@ CPPSRCS        =                                 \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES                += -DWIN32_LEAN_AND_MEAN
-endif
--- a/extensions/xmlextras/wsdl/src/Makefile.in
+++ b/extensions/xmlextras/wsdl/src/Makefile.in
@ -54,7 +54,3 @@ LOCAL_INCLUDES	= \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -137,9 +137,6 @@ endif
 include $(topsrcdir)/config/rules.mk

 DEFINES     += -D_IMPL_NS_GFX
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif

 libs:: icon_0.gif icon_1.gif
 	$(INSTALL) -m 555 $^ $(DIST)/bin/res/gfx
--- a/gfx/src/windows/Makefile.in
+++ b/gfx/src/windows/Makefile.in
@ -101,7 +101,7 @@ libs:: fontEncoding.properties
 install:: fontEncoding.properties
 	$(INSTALL) $^ $(DESTDIR)$(mozappdir)/res/fonts

-DEFINES	+= -DWIN32_LEAN_AND_MEAN -DSTRICT 
+DEFINES	+= -DSTRICT 

 EXTRA_DSO_LDOPTS += \
 		$(EXTRA_DSO_LIBS) \
--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@ -94,7 +94,3 @@ EXTRA_DSO_LDOPTS += \
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -DXML_DTD
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@ -58,5 +58,5 @@ CPPSRCS		= \
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+DEFINES		+= -D__STDC__
 endif
--- a/intl/compatibility/src/Makefile.in
+++ b/intl/compatibility/src/Makefile.in
@ -49,5 +49,5 @@ include $(topsrcdir)/config/rules.mk
 INCLUDES	+= -I..

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+DEFINES		+= -D__STDC__
 endif
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@ -74,7 +74,3 @@ libs::

 install::
 	$(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/res
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES	+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/intl/locale/src/windows/Makefile.in
+++ b/intl/locale/src/windows/Makefile.in
@ -47,5 +47,3 @@ CPPSRCS		= \
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= -I$(srcdir)/..
-
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@ -52,7 +52,3 @@ ifeq (,$(filter AIX OpenVMS QNX HP-UX,$(OS_ARCH)))
 CFLAGS		+= -D__STDC__
 endif

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -157,10 +157,6 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_XOPEN_SOURCE=500
 endif

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 libs:: $(EXPORT_RESOURCE)
 	$(INSTALL) $^ $(DIST)/bin/res

--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@ -57,7 +57,3 @@ EXPORTS		= nsUCvCnCID.h
 LOCAL_INCLUDES = -I$(srcdir)/../util

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@ -76,7 +76,3 @@ endif
 endif

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES += -DWIN32_LEAN_AND_MEAN
-endif
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@ -55,7 +55,3 @@ LOCAL_INCLUDES = -I$(srcdir)/../util

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@ -169,7 +169,3 @@ EXPORTS		= nsUCvLatinCID.h
 LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/intl/uconv/ucvmath/Makefile.in
+++ b/intl/uconv/ucvmath/Makefile.in
@ -73,7 +73,3 @@ SHARED_LIBRARY_LIBS = \
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@ -51,7 +51,3 @@ EXPORTS		= nsUCvTWCID.h
 LOCAL_INCLUDES = -I$(srcdir)/../util

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@ -59,7 +59,3 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/intl/unicharutil/src/Makefile.in
+++ b/intl/unicharutil/src/Makefile.in
@ -48,5 +48,5 @@ CPPSRCS		= \
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+DEFINES		+= -D__STDC__
 endif
--- a/js/src/xpconnect/sample/Makefile.in
+++ b/js/src/xpconnect/sample/Makefile.in
@ -42,8 +42,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME = xpconnect_sample

-DEFINES=-DWIN32_LEAN_AND_MEAN
-
 REQUIRES = XPCOM \
 	XPCONNECT \
 	JS \
--- a/js/src/xpconnect/shell/Makefile.in
+++ b/js/src/xpconnect/shell/Makefile.in
@ -60,9 +60,6 @@ DEFINES		+= -DJS_THREADSAFE
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif

 #
 # Line editing support.  If your OS supplies the readline library, define
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@ -122,7 +122,6 @@ DEFINES		+= -DXPC_IDISPATCH_SUPPORT
 endif

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
 # use pre-compiled headers
 CXXFLAGS	+= -YX -Fp$(LIBRARY_NAME).pch
 # precompiled headers require write access to .pch which breaks -j builds
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/src/xpconnect/tests/Makefile.in
@ -60,6 +60,3 @@ LIBS		= \
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -DJS_THREADSAFE -DJSFILE
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/js/src/xpconnect/tests/components/Makefile.in
+++ b/js/src/xpconnect/tests/components/Makefile.in
@ -76,7 +76,3 @@ EXTRA_DSO_LDOPTS += \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/js/src/xpconnect/tools/src/Makefile.in
+++ b/js/src/xpconnect/tools/src/Makefile.in
@ -65,7 +65,4 @@ EXTRA_DSO_LDOPTS += \
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -DJSFILE -DJS_THREADSAFE
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif

--- a/layout/base/src/Makefile.in
+++ b/layout/base/src/Makefile.in
@ -78,10 +78,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../html/base/src \
--- a/layout/html/base/src/Makefile.in
+++ b/layout/html/base/src/Makefile.in
@ -147,10 +147,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../xul/base/src \
 		-I$(srcdir)/../../../xul/content/src \
--- a/layout/html/document/src/Makefile.in
+++ b/layout/html/document/src/Makefile.in
@ -60,10 +60,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
--- a/layout/html/forms/src/Makefile.in
+++ b/layout/html/forms/src/Makefile.in
@ -75,10 +75,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../base/src \
--- a/layout/html/style/src/Makefile.in
+++ b/layout/html/style/src/Makefile.in
@ -63,10 +63,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \
--- a/layout/html/table/src/Makefile.in
+++ b/layout/html/table/src/Makefile.in
@ -61,10 +61,6 @@ include $(topsrcdir)/config/rules.mk

 DEFINES         += -DDEBUG_TABLE_REFLOW_TIMING_off -DDEBUG_TABLE_STRATEGY_off

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../style/src \
--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@ -88,10 +88,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 _PROPERTIES 	= \
 	mathfont.properties \
 	mathfontPUA.properties \
--- a/layout/mathml/content/src/Makefile.in
+++ b/layout/mathml/content/src/Makefile.in
@ -38,10 +38,6 @@ REQUIRES	= xpcom \

 include $(topsrcdir)/config/config.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 CPPSRCS =				\
 	nsMathMLAtoms.cpp  \
        nsMathMLOperators.cpp \
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@ -69,10 +69,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 CXXFLAGS	+= $(MOZ_LIBART_CFLAGS)

 LOCAL_INCLUDES	= \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -112,10 +112,6 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../base/src \
--- a/mailnews/base/src/nsMessengerWinIntegration.h
+++ b/mailnews/base/src/nsMessengerWinIntegration.h
@ -43,6 +43,9 @@

 #include <windows.h>

+// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <shellapi.h>
+
 #include "nsIMessengerOSIntegration.h"
 #include "nsIFolderListener.h"
 #include "nsIAlertsService.h"
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -111,7 +111,6 @@ endif
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
 CXXFLAGS	+= -GX
 OS_LIBS		+= version.lib
 endif
--- a/modules/plugin/samples/default/windows/Makefile.in
+++ b/modules/plugin/samples/default/windows/Makefile.in
@ -45,8 +45,6 @@ CPPSRCS		= \
 		utils.cpp \
 		$(NULL)

-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-
 # plugins should always be shared, even in the "static" build
 FORCE_SHARED_LIB = 1

--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@ -99,7 +99,4 @@ include $(topsrcdir)/config/rules.mk
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -D_BSD_SOURCE
 endif
-ifeq ($(OS_ARCH),WINNT)
-DEFINES += -DWIN32_LEAN_AND_MEAN
-endif

--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -105,7 +105,3 @@ EXTRA_DSO_LDOPTS += \
 endif

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES                += -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/build2/Makefile.in
+++ b/netwerk/build2/Makefile.in
@ -56,7 +56,3 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES                += -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/cache/src/Makefile.in
+++ b/netwerk/cache/src/Makefile.in
@ -66,6 +66,3 @@ include $(topsrcdir)/config/rules.mk
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -D_BSD_SOURCE
 endif
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/dns/src/Makefile.in
+++ b/netwerk/dns/src/Makefile.in
@ -46,7 +46,3 @@ include $(topsrcdir)/config/rules.mk
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
 endif
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/mime/src/Makefile.in
+++ b/netwerk/mime/src/Makefile.in
@ -44,7 +44,3 @@ FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-
--- a/netwerk/protocol/about/src/Makefile.in
+++ b/netwerk/protocol/about/src/Makefile.in
@ -50,7 +50,3 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/protocol/data/src/Makefile.in
+++ b/netwerk/protocol/data/src/Makefile.in
@ -42,7 +42,3 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/protocol/file/src/Makefile.in
+++ b/netwerk/protocol/file/src/Makefile.in
@ -50,7 +50,3 @@ LOCAL_INCLUDES =                        \
        $(NULL)

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/protocol/ftp/src/Makefile.in
+++ b/netwerk/protocol/ftp/src/Makefile.in
@ -59,7 +59,6 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
 ifndef MOZ_DEBUG
 ifndef NO_LOGGING
 DEFINES		+= -DFORCE_PR_LOG
--- a/netwerk/protocol/gopher/src/Makefile.in
+++ b/netwerk/protocol/gopher/src/Makefile.in
@ -45,7 +45,3 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/protocol/http/src/Makefile.in
+++ b/netwerk/protocol/http/src/Makefile.in
@ -64,7 +64,3 @@ LOCAL_INCLUDES=-I$(srcdir)/../../../base/src
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/protocol/jar/src/Makefile.in
+++ b/netwerk/protocol/jar/src/Makefile.in
@ -53,7 +53,3 @@ LOCAL_INCLUDES	= \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/protocol/res/src/Makefile.in
+++ b/netwerk/protocol/res/src/Makefile.in
@ -49,9 +49,6 @@ LOCAL_INCLUDES =                        \

 include $(topsrcdir)/config/rules.mk

-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
 ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_BSD_SOURCE
 endif
--- a/netwerk/protocol/viewsource/src/Makefile.in
+++ b/netwerk/protocol/viewsource/src/Makefile.in
@ -44,7 +44,3 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@ -74,6 +74,6 @@ LOCAL_INCLUDES =                        \
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN -DZLIB_DLL
+DEFINES		+= -DZLIB_DLL
 endif

--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@ -48,7 +48,3 @@ endif
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@ -94,7 +94,3 @@ EXTRA_DSO_LDOPTS += \
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -DXML_DTD
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/string/obsolete/Makefile.in
+++ b/string/obsolete/Makefile.in
@ -59,7 +59,3 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_COM
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/string/src/Makefile.in
+++ b/string/src/Makefile.in
@ -61,7 +61,3 @@ FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_COM
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
--- a/uriloader/exthandler/win/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/win/nsOSHelperAppService.cpp
@ -34,6 +34,9 @@
 // we need windows.h to read out registry information...
 #include <windows.h>

+// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <shellapi.h>
+
 // helper methods: forward declarations...
 BYTE * GetValueBytes( HKEY hKey, const char *pValueName, DWORD *pLen=0);
 nsresult GetExtensionFrom4xRegistryInfo(const char * aMimeType, nsCString& aFileExtension);
--- a/webshell/tests/viewer/windows/Makefile.in
+++ b/webshell/tests/viewer/windows/Makefile.in
@ -44,8 +44,6 @@ CPPSRCS		= \
 		nsLabel.cpp \
 		$(NULL)

-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-
 ifdef MOZ_UNICODE
 DEFINES += -DMOZ_UNICODE 
 endif
--- a/widget/src/windows/nsAppShell.cpp
+++ b/widget/src/windows/nsAppShell.cpp
@ -42,6 +42,10 @@
 #include "nsIEventQueueService.h"
 #include "nsIServiceManager.h"
 #include <windows.h>
+
+// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <unknwn.h>
+
 #include "nsWidgetsCID.h"
 #ifdef MOZ_AIMM
 #include "aimm.h"
--- a/widget/src/windows/nsClipboard.cpp
+++ b/widget/src/windows/nsClipboard.cpp
@ -42,6 +42,9 @@
 #include <SHLOBJ.H>
 #include <INTSHCUT.H>

+// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <shellapi.h>
+
 #include "nsCOMPtr.h"
 #include "nsDataObj.h"
 #include "nsIClipboardOwner.h"
--- a/widget/src/windows/nsDragService.cpp
+++ b/widget/src/windows/nsDragService.cpp
@ -51,6 +51,9 @@
 #include <OLE2.h>
 #include "OLEIDL.H"

+// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <shellapi.h>
+

 //-------------------------------------------------------------------------
 //
--- a/widget/src/windows/nsFilePicker.cpp
+++ b/widget/src/windows/nsFilePicker.cpp
@ -22,11 +22,6 @@
 *   Seth Spitzer <sspitzer@netscape.com>
 */

-// Define so header files for openfilename are included
-#ifdef WIN32_LEAN_AND_MEAN
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
 #include "nsCOMPtr.h"
 #include "nsReadableUtils.h"
 #include "nsNetUtil.h"
@ -42,6 +37,10 @@
 #include <windows.h>
 #include <SHLOBJ.H>

+// commdlg.h and cderr.h are needed to build with WIN32_LEAN_AND_MEAN
+#include <commdlg.h>
+#include <cderr.h>
+
 #ifdef MOZ_UNICODE
 #include "nsString.h"
 #include "nsToolkit.h"
--- a/widget/src/windows/nsSound.cpp
+++ b/widget/src/windows/nsSound.cpp
@ -27,6 +27,9 @@

 #include <windows.h>

+// mmsystem.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <mmsystem.h>
+
 #include "nsSound.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
--- a/widget/src/windows/nsToolkit.cpp
+++ b/widget/src/windows/nsToolkit.cpp
@ -45,10 +45,15 @@
 #include "nsIEventQueueService.h"
 #include "nsIEventQueue.h"
 #ifdef MOZ_AIMM
+// objbase.h must be declared before initguid.h to use the |DEFINE_GUID|'s in aimm.h
+#include <objbase.h>
 #include <initguid.h>
 #include "aimm.h"
 #endif

+// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <unknwn.h>
+
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);

 // Cached reference to event queue service
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@ -67,6 +67,9 @@
 #include "nsIEventQueue.h"
 #include <windows.h>

+// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN
+#include <unknwn.h>
+
 //#include <winuser.h>
 #include <zmouse.h>
 //#include "sysmets.h"
--- a/Показать больше
+++ b/Показать больше