From 57e08a3f3ad6852bf3120c67278bfeca5309faa9 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Thu, 17 Oct 2002 06:47:01 +0000 Subject: [PATCH] Define WIN32_LEAN_AND_MEAN globally for win32 builds. Thanks to Stephen Walker for the patch. Bug #172898 r=cls a=asa --- content/base/src/Makefile.in | 4 ---- content/events/src/Makefile.in | 4 ---- content/html/content/src/Makefile.in | 4 ---- content/html/document/src/Makefile.in | 4 ---- content/html/style/src/Makefile.in | 4 ---- content/shared/src/Makefile.in | 4 ---- content/xbl/src/Makefile.in | 4 ---- content/xml/document/src/Makefile.in | 4 ---- content/xsl/document/src/Makefile.in | 4 ---- content/xul/content/src/Makefile.in | 4 ---- content/xul/document/src/Makefile.in | 4 ---- content/xul/templates/src/Makefile.in | 4 ---- dom/src/base/Makefile.in | 4 ---- dom/src/events/Makefile.in | 4 ---- embedding/browser/activex/src/control/HelperAppDlg.cpp | 3 +++ embedding/browser/activex/src/control/MozillaBrowser.cpp | 3 +++ embedding/browser/activex/src/plugin/Makefile.in | 2 -- embedding/components/build/Makefile.in | 4 ---- embedding/tests/mfcembed/components/Makefile.in | 2 +- embedding/tests/winEmbed/StdAfx.h | 2 -- extensions/cookie/Makefile.in | 4 ---- extensions/cookie/tests/Makefile.in | 4 ---- extensions/inspector/base/src/Makefile.in | 4 ---- extensions/inspector/base/src/win/Makefile.in | 4 ---- extensions/interfaceinfo/src/Makefile.in | 4 ---- extensions/universalchardet/src/Makefile.in | 2 +- extensions/webservices/interfaceinfo/src/Makefile.in | 4 ---- extensions/webservices/schema/src/Makefile.in | 4 ---- extensions/webservices/soap/src/Makefile.in | 4 ---- extensions/webservices/wsdl/src/Makefile.in | 4 ---- extensions/xmlextras/base/src/Makefile.in | 4 ---- extensions/xmlextras/interfaceinfo/src/Makefile.in | 4 ---- extensions/xmlextras/schema/src/Makefile.in | 4 ---- extensions/xmlextras/soap/src/Makefile.in | 4 ---- extensions/xmlextras/wsdl/src/Makefile.in | 4 ---- gfx/src/Makefile.in | 3 --- gfx/src/windows/Makefile.in | 2 +- htmlparser/src/Makefile.in | 4 ---- intl/chardet/src/Makefile.in | 2 +- intl/compatibility/src/Makefile.in | 2 +- intl/locale/src/Makefile.in | 4 ---- intl/locale/src/windows/Makefile.in | 2 -- intl/lwbrk/src/Makefile.in | 4 ---- intl/uconv/src/Makefile.in | 4 ---- intl/uconv/ucvcn/Makefile.in | 4 ---- intl/uconv/ucvibm/Makefile.in | 4 ---- intl/uconv/ucvko/Makefile.in | 4 ---- intl/uconv/ucvlatin/Makefile.in | 4 ---- intl/uconv/ucvmath/Makefile.in | 4 ---- intl/uconv/ucvtw/Makefile.in | 4 ---- intl/uconv/ucvtw2/Makefile.in | 4 ---- intl/unicharutil/src/Makefile.in | 2 +- js/src/xpconnect/sample/Makefile.in | 2 -- js/src/xpconnect/shell/Makefile.in | 3 --- js/src/xpconnect/src/Makefile.in | 1 - js/src/xpconnect/tests/Makefile.in | 3 --- js/src/xpconnect/tests/components/Makefile.in | 4 ---- js/src/xpconnect/tools/src/Makefile.in | 3 --- layout/base/src/Makefile.in | 4 ---- layout/html/base/src/Makefile.in | 4 ---- layout/html/document/src/Makefile.in | 4 ---- layout/html/forms/src/Makefile.in | 4 ---- layout/html/style/src/Makefile.in | 4 ---- layout/html/table/src/Makefile.in | 4 ---- layout/mathml/base/src/Makefile.in | 4 ---- layout/mathml/content/src/Makefile.in | 4 ---- layout/svg/base/src/Makefile.in | 4 ---- layout/xul/base/src/Makefile.in | 4 ---- mailnews/base/src/nsMessengerWinIntegration.h | 3 +++ modules/plugin/base/src/Makefile.in | 1 - modules/plugin/samples/default/windows/Makefile.in | 2 -- netwerk/base/src/Makefile.in | 3 --- netwerk/build/Makefile.in | 4 ---- netwerk/build2/Makefile.in | 4 ---- netwerk/cache/src/Makefile.in | 3 --- netwerk/dns/src/Makefile.in | 4 ---- netwerk/mime/src/Makefile.in | 4 ---- netwerk/protocol/about/src/Makefile.in | 4 ---- netwerk/protocol/data/src/Makefile.in | 4 ---- netwerk/protocol/file/src/Makefile.in | 4 ---- netwerk/protocol/ftp/src/Makefile.in | 1 - netwerk/protocol/gopher/src/Makefile.in | 4 ---- netwerk/protocol/http/src/Makefile.in | 4 ---- netwerk/protocol/jar/src/Makefile.in | 4 ---- netwerk/protocol/res/src/Makefile.in | 3 --- netwerk/protocol/viewsource/src/Makefile.in | 4 ---- netwerk/streamconv/converters/Makefile.in | 2 +- netwerk/streamconv/src/Makefile.in | 4 ---- parser/htmlparser/src/Makefile.in | 4 ---- string/obsolete/Makefile.in | 4 ---- string/src/Makefile.in | 4 ---- uriloader/exthandler/win/nsOSHelperAppService.cpp | 3 +++ webshell/tests/viewer/windows/Makefile.in | 2 -- widget/src/windows/nsAppShell.cpp | 4 ++++ widget/src/windows/nsClipboard.cpp | 3 +++ widget/src/windows/nsDragService.cpp | 3 +++ widget/src/windows/nsFilePicker.cpp | 9 ++++----- widget/src/windows/nsSound.cpp | 3 +++ widget/src/windows/nsToolkit.cpp | 5 +++++ widget/src/windows/nsWindow.cpp | 3 +++ xpcom/base/Makefile.in | 4 ---- xpcom/build/Makefile.in | 1 - xpcom/build/malloc.c | 1 - xpcom/components/Makefile.in | 3 --- xpcom/ds/Makefile.in | 4 ---- xpcom/glue/Makefile.in | 4 ---- xpcom/glue/standalone/Makefile.in | 4 ---- xpcom/io/Makefile.in | 3 --- xpcom/proxy/src/Makefile.in | 4 ---- xpcom/reflect/xptcall/src/Makefile.in | 4 ---- xpcom/reflect/xptcall/src/md/win32/Makefile.in | 4 ---- xpcom/reflect/xptcall/tests/Makefile.in | 4 ---- xpcom/reflect/xptinfo/src/Makefile.in | 3 --- xpcom/reflect/xptinfo/tests/Makefile.in | 3 --- xpcom/string/obsolete/Makefile.in | 4 ---- xpcom/string/src/Makefile.in | 4 ---- xpcom/tests/windows/TestCOM.cpp | 3 +++ xpcom/threads/Makefile.in | 3 --- xpcom/typelib/xpt/src/Makefile.in | 4 ---- xpcom/typelib/xpt/tests/Makefile.in | 3 --- xpcom/typelib/xpt/tools/Makefile.in | 2 +- xpfe/appshell/src/Makefile.in | 1 - xpfe/bootstrap/Makefile.in | 1 - xpfe/browser/src/Makefile.in | 4 ---- xpfe/components/build/Makefile.in | 1 - xpinstall/cleanup/Makefile.in | 1 - xpinstall/src/Makefile.in | 2 +- xpinstall/wizard/windows/nsinstall/nsinstall.cpp | 5 +++++ xpinstall/wizard/windows/setup/dialogs.c | 3 +++ xpinstall/wizard/windows/setup/extra.c | 3 +++ xpinstall/wizard/windows/uninstall/extra.c | 3 +++ 131 files changed, 63 insertions(+), 386 deletions(-) diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 4a0a8208e3ce..3cf4803b7383 100644 --- 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 \ diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index f6a8586b2c9d..a5dc53afd3db 100644 --- 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) diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 9c3813efd6ce..b9828b4ad8c0 100644 --- 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 \ diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index 1e83a1d32a3c..834fc63e046d 100644 --- 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 \ diff --git a/content/html/style/src/Makefile.in b/content/html/style/src/Makefile.in index e17521850955..695bf74c96e0 100644 --- 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 \ diff --git a/content/shared/src/Makefile.in b/content/shared/src/Makefile.in index dc6e8df0028a..f393623ceb99 100644 --- 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 diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 898acf7f533e..957b111d9cc4 100644 --- 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 \ diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index c2d2b6fe0f6c..f5b73c52d28d 100644 --- 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 \ diff --git a/content/xsl/document/src/Makefile.in b/content/xsl/document/src/Makefile.in index ada81a0412f1..1274befcd1f1 100755 --- 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 \ diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index d540e5b16482..876005cbb20c 100644 --- 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 \ diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index 7e959d59b063..e788dab5c94c 100644 --- 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 \ diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in index 49008c77db93..55f666044ed9 100644 --- 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) diff --git a/dom/src/base/Makefile.in b/dom/src/base/Makefile.in index 825ba445412b..780b103e935f 100644 --- 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 - diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 2fa337436576..6df31b95737e 100644 --- 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 - diff --git a/embedding/browser/activex/src/control/HelperAppDlg.cpp b/embedding/browser/activex/src/control/HelperAppDlg.cpp index 1f8c8680c53d..25182a841cba 100644 --- a/embedding/browser/activex/src/control/HelperAppDlg.cpp +++ b/embedding/browser/activex/src/control/HelperAppDlg.cpp @@ -41,6 +41,9 @@ #include +// commdlg.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #include "HelperAppDlg.h" #include "nsCOMPtr.h" diff --git a/embedding/browser/activex/src/control/MozillaBrowser.cpp b/embedding/browser/activex/src/control/MozillaBrowser.cpp index 3bfcf5b8ce3f..5f514116c844 100644 --- a/embedding/browser/activex/src/control/MozillaBrowser.cpp +++ b/embedding/browser/activex/src/control/MozillaBrowser.cpp @@ -43,6 +43,9 @@ //#include #include +// commdlg.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #include "MozillaControl.h" #include "MozillaBrowser.h" #include "IEHtmlDocument.h" diff --git a/embedding/browser/activex/src/plugin/Makefile.in b/embedding/browser/activex/src/plugin/Makefile.in index d78e482f5251..1cb146a57cf5 100644 --- 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 diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in index 5a2a32d40dbd..1d33b2fddfe1 100644 --- 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 diff --git a/embedding/tests/mfcembed/components/Makefile.in b/embedding/tests/mfcembed/components/Makefile.in index 37f1e91a3bf1..1064a18f5e90 100644 --- 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 diff --git a/embedding/tests/winEmbed/StdAfx.h b/embedding/tests/winEmbed/StdAfx.h index 3c26f2f98f52..04516ec3eb42 100644 --- 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 diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index 335693ebae5f..dca960f83447 100644 --- 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 - diff --git a/extensions/cookie/tests/Makefile.in b/extensions/cookie/tests/Makefile.in index 8cd99b6d3921..304f44b68b5e 100644 --- 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 - diff --git a/extensions/inspector/base/src/Makefile.in b/extensions/inspector/base/src/Makefile.in index e114e02c0339..279698955b9b 100644 --- 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 diff --git a/extensions/inspector/base/src/win/Makefile.in b/extensions/inspector/base/src/win/Makefile.in index 4256bd4f0d62..199a06d4fb08 100644 --- 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 diff --git a/extensions/interfaceinfo/src/Makefile.in b/extensions/interfaceinfo/src/Makefile.in index 3f2f3f7ce926..e28f1643cfb4 100644 --- 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 - diff --git a/extensions/universalchardet/src/Makefile.in b/extensions/universalchardet/src/Makefile.in index f91a47f656c8..2955f84a2cec 100644 --- 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 diff --git a/extensions/webservices/interfaceinfo/src/Makefile.in b/extensions/webservices/interfaceinfo/src/Makefile.in index 3f2f3f7ce926..e28f1643cfb4 100644 --- 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 - diff --git a/extensions/webservices/schema/src/Makefile.in b/extensions/webservices/schema/src/Makefile.in index 9ffcbd7c6e84..aec094b678bc 100644 --- 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 diff --git a/extensions/webservices/soap/src/Makefile.in b/extensions/webservices/soap/src/Makefile.in index 3f5e81c0786e..286e6cd68804 100644 --- 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 diff --git a/extensions/webservices/wsdl/src/Makefile.in b/extensions/webservices/wsdl/src/Makefile.in index f94454492d05..ed5dd2e3c9df 100644 --- 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 diff --git a/extensions/xmlextras/base/src/Makefile.in b/extensions/xmlextras/base/src/Makefile.in index 1908ce552b44..c1ecedfb147c 100644 --- 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 diff --git a/extensions/xmlextras/interfaceinfo/src/Makefile.in b/extensions/xmlextras/interfaceinfo/src/Makefile.in index 3f2f3f7ce926..e28f1643cfb4 100644 --- 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 - diff --git a/extensions/xmlextras/schema/src/Makefile.in b/extensions/xmlextras/schema/src/Makefile.in index 9ffcbd7c6e84..aec094b678bc 100644 --- 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 diff --git a/extensions/xmlextras/soap/src/Makefile.in b/extensions/xmlextras/soap/src/Makefile.in index 3f5e81c0786e..286e6cd68804 100644 --- 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 diff --git a/extensions/xmlextras/wsdl/src/Makefile.in b/extensions/xmlextras/wsdl/src/Makefile.in index f94454492d05..ed5dd2e3c9df 100644 --- 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 diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index 60cab86707af..ed5146db89e6 100644 --- 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 diff --git a/gfx/src/windows/Makefile.in b/gfx/src/windows/Makefile.in index c723aef52ec6..6412bb9d9408 100644 --- 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) \ diff --git a/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in index ad8222bb56bb..9183b7d51511 100644 --- 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 diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in index 32317d1dc6aa..9016256e6f5c 100644 --- 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 diff --git a/intl/compatibility/src/Makefile.in b/intl/compatibility/src/Makefile.in index 0b1761ffeec7..5f0261791963 100644 --- 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 diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index e6896bb3af7e..80ef8f5df955 100644 --- 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 diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in index 9d3b67951c64..498a36899244 100644 --- 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 diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index b4c9ac6cb2fd..a76175cccb01 100644 --- 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 - diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index 0a4c9d67ea05..763b91bc4a97 100644 --- 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 diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in index a9401e6ca211..be94ac29257f 100644 --- 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 diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index 25c782dbb965..6ceed9014eba 100644 --- 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 diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index b7ab30b83432..d4a6e7e197be 100644 --- 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 - diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index 387a343c9af4..eb7f98eb228f 100644 --- 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 diff --git a/intl/uconv/ucvmath/Makefile.in b/intl/uconv/ucvmath/Makefile.in index d0a6b9e44b9f..deab02a8f80e 100644 --- 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 diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in index 3e8c0fdf3316..5ba4df9dccac 100644 --- 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 diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in index 1427069eaa03..af07c608e452 100644 --- 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 - diff --git a/intl/unicharutil/src/Makefile.in b/intl/unicharutil/src/Makefile.in index 999e800a487d..ebf26c7f2d31 100644 --- 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 diff --git a/js/src/xpconnect/sample/Makefile.in b/js/src/xpconnect/sample/Makefile.in index 02399257513e..b05e2d2a51af 100644 --- 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 \ diff --git a/js/src/xpconnect/shell/Makefile.in b/js/src/xpconnect/shell/Makefile.in index b2db45c7db12..5f68663566ff 100644 --- 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 diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in index 5d4f4f666898..77a3297c3b72 100644 --- 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 diff --git a/js/src/xpconnect/tests/Makefile.in b/js/src/xpconnect/tests/Makefile.in index 778b479ee304..2cf09ceb16f6 100644 --- 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 diff --git a/js/src/xpconnect/tests/components/Makefile.in b/js/src/xpconnect/tests/components/Makefile.in index a3b0a1306b5f..7fda6746f432 100644 --- 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 diff --git a/js/src/xpconnect/tools/src/Makefile.in b/js/src/xpconnect/tools/src/Makefile.in index 5c8d1e32199b..9defd363bab0 100644 --- 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 diff --git a/layout/base/src/Makefile.in b/layout/base/src/Makefile.in index 03f0c27aa912..67664bde5ed9 100644 --- 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 \ diff --git a/layout/html/base/src/Makefile.in b/layout/html/base/src/Makefile.in index 09e591d76a39..887bd517532c 100644 --- 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 \ diff --git a/layout/html/document/src/Makefile.in b/layout/html/document/src/Makefile.in index f5550c3d9113..07ee4af51c13 100644 --- 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 \ diff --git a/layout/html/forms/src/Makefile.in b/layout/html/forms/src/Makefile.in index cee3ee1d066d..e264758f1685 100644 --- 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 \ diff --git a/layout/html/style/src/Makefile.in b/layout/html/style/src/Makefile.in index 2326dd74913d..1b3f02164b1d 100644 --- 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 \ diff --git a/layout/html/table/src/Makefile.in b/layout/html/table/src/Makefile.in index 630a2aa7d7b8..dd879bd541db 100644 --- 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 \ diff --git a/layout/mathml/base/src/Makefile.in b/layout/mathml/base/src/Makefile.in index c583d4d88f3c..ade80a488a88 100644 --- 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 \ diff --git a/layout/mathml/content/src/Makefile.in b/layout/mathml/content/src/Makefile.in index 49688f21e490..1ec04d93a22f 100644 --- 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 \ diff --git a/layout/svg/base/src/Makefile.in b/layout/svg/base/src/Makefile.in index fa2ed358ae79..8436f9adf9d4 100644 --- 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 = \ diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index eb06896a090a..91d47cc28326 100644 --- 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 \ diff --git a/mailnews/base/src/nsMessengerWinIntegration.h b/mailnews/base/src/nsMessengerWinIntegration.h index f8c7e96d8ddf..578c0f01c1ce 100644 --- a/mailnews/base/src/nsMessengerWinIntegration.h +++ b/mailnews/base/src/nsMessengerWinIntegration.h @@ -43,6 +43,9 @@ #include +// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #include "nsIMessengerOSIntegration.h" #include "nsIFolderListener.h" #include "nsIAlertsService.h" diff --git a/modules/plugin/base/src/Makefile.in b/modules/plugin/base/src/Makefile.in index eec7a74a3eda..ea2c932f1da5 100644 --- 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 diff --git a/modules/plugin/samples/default/windows/Makefile.in b/modules/plugin/samples/default/windows/Makefile.in index 83d79b08e997..4c8d7eaf7c43 100644 --- 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 diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index a7f75f592dc4..cc5b5025c529 100644 --- 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 diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 6a7996420987..22fd2f36b505 100644 --- 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 diff --git a/netwerk/build2/Makefile.in b/netwerk/build2/Makefile.in index 3472e21a0f40..40b7a62b1a98 100644 --- 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 diff --git a/netwerk/cache/src/Makefile.in b/netwerk/cache/src/Makefile.in index e44bb211f0e3..783107287ab1 100644 --- 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 diff --git a/netwerk/dns/src/Makefile.in b/netwerk/dns/src/Makefile.in index 323fe88f006a..e8611f0cd758 100644 --- 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 diff --git a/netwerk/mime/src/Makefile.in b/netwerk/mime/src/Makefile.in index e71d4909d876..d2a729920ce6 100644 --- 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 - diff --git a/netwerk/protocol/about/src/Makefile.in b/netwerk/protocol/about/src/Makefile.in index 6259b94c93bf..968f93018292 100644 --- 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 diff --git a/netwerk/protocol/data/src/Makefile.in b/netwerk/protocol/data/src/Makefile.in index a1bd3c024477..3025afc1d5b4 100644 --- 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 diff --git a/netwerk/protocol/file/src/Makefile.in b/netwerk/protocol/file/src/Makefile.in index ccbfe33524ff..9909d0e091e9 100644 --- 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 diff --git a/netwerk/protocol/ftp/src/Makefile.in b/netwerk/protocol/ftp/src/Makefile.in index f6a9be297681..ea8c33fad152 100644 --- 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 diff --git a/netwerk/protocol/gopher/src/Makefile.in b/netwerk/protocol/gopher/src/Makefile.in index 1c225b642476..fa2660a6f97d 100644 --- 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 diff --git a/netwerk/protocol/http/src/Makefile.in b/netwerk/protocol/http/src/Makefile.in index 35fde9bda357..1ee824408da7 100644 --- 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 diff --git a/netwerk/protocol/jar/src/Makefile.in b/netwerk/protocol/jar/src/Makefile.in index 5748574a8376..2a67af9f6a6d 100644 --- 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 diff --git a/netwerk/protocol/res/src/Makefile.in b/netwerk/protocol/res/src/Makefile.in index a0fa6bac1fb0..e597ad9fc841 100644 --- 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 diff --git a/netwerk/protocol/viewsource/src/Makefile.in b/netwerk/protocol/viewsource/src/Makefile.in index de2bd3fb2538..2a324a6f23f7 100644 --- 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 diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 3d1910356733..01b70298ff5c 100644 --- 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 diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index 10feb984acec..b46287655043 100644 --- 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 diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index ad8222bb56bb..9183b7d51511 100644 --- 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 diff --git a/string/obsolete/Makefile.in b/string/obsolete/Makefile.in index fd9681be817a..080c45b1d20a 100644 --- 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 diff --git a/string/src/Makefile.in b/string/src/Makefile.in index 7aa741c91139..5459354e5603 100644 --- 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 diff --git a/uriloader/exthandler/win/nsOSHelperAppService.cpp b/uriloader/exthandler/win/nsOSHelperAppService.cpp index bda4c7d8b1ea..47a61a2c0075 100644 --- 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 +// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN +#include + // helper methods: forward declarations... BYTE * GetValueBytes( HKEY hKey, const char *pValueName, DWORD *pLen=0); nsresult GetExtensionFrom4xRegistryInfo(const char * aMimeType, nsCString& aFileExtension); diff --git a/webshell/tests/viewer/windows/Makefile.in b/webshell/tests/viewer/windows/Makefile.in index 35acd45cec8a..c3eb3305aacc 100644 --- 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 diff --git a/widget/src/windows/nsAppShell.cpp b/widget/src/windows/nsAppShell.cpp index 22b38b4af7e2..fb6fcf901267 100644 --- a/widget/src/windows/nsAppShell.cpp +++ b/widget/src/windows/nsAppShell.cpp @@ -42,6 +42,10 @@ #include "nsIEventQueueService.h" #include "nsIServiceManager.h" #include + +// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #include "nsWidgetsCID.h" #ifdef MOZ_AIMM #include "aimm.h" diff --git a/widget/src/windows/nsClipboard.cpp b/widget/src/windows/nsClipboard.cpp index df303b210a16..7227c0f37d99 100644 --- a/widget/src/windows/nsClipboard.cpp +++ b/widget/src/windows/nsClipboard.cpp @@ -42,6 +42,9 @@ #include #include +// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #include "nsCOMPtr.h" #include "nsDataObj.h" #include "nsIClipboardOwner.h" diff --git a/widget/src/windows/nsDragService.cpp b/widget/src/windows/nsDragService.cpp index 9971e37b878f..d5114ca18865 100644 --- a/widget/src/windows/nsDragService.cpp +++ b/widget/src/windows/nsDragService.cpp @@ -51,6 +51,9 @@ #include #include "OLEIDL.H" +// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN +#include + //------------------------------------------------------------------------- // diff --git a/widget/src/windows/nsFilePicker.cpp b/widget/src/windows/nsFilePicker.cpp index 11c7ba6d017b..2931c0b13745 100644 --- a/widget/src/windows/nsFilePicker.cpp +++ b/widget/src/windows/nsFilePicker.cpp @@ -22,11 +22,6 @@ * Seth Spitzer */ -// 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 #include +// commdlg.h and cderr.h are needed to build with WIN32_LEAN_AND_MEAN +#include +#include + #ifdef MOZ_UNICODE #include "nsString.h" #include "nsToolkit.h" diff --git a/widget/src/windows/nsSound.cpp b/widget/src/windows/nsSound.cpp index 75280b252220..6e6665f4526d 100644 --- a/widget/src/windows/nsSound.cpp +++ b/widget/src/windows/nsSound.cpp @@ -27,6 +27,9 @@ #include +// mmsystem.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #include "nsSound.h" #include "nsIURL.h" #include "nsNetUtil.h" diff --git a/widget/src/windows/nsToolkit.cpp b/widget/src/windows/nsToolkit.cpp index f812683dd6f4..ca4887f668b0 100644 --- 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 #include #include "aimm.h" #endif +// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN +#include + static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); // Cached reference to event queue service diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 41b4bf789d37..995fbd0f6b5f 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -67,6 +67,9 @@ #include "nsIEventQueue.h" #include +// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN +#include + //#include #include //#include "sysmets.h" diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index 5834cfb1956a..1eb98355090f 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -122,7 +122,3 @@ DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif - -ifeq ($(OS_ARCH), WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index dd49bfda257b..cca2a31ea22b 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -138,7 +138,6 @@ EXTRA_DSO_LDOPTS += -lbe endif ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN EXTRA_DSO_LDOPTS += shell32.lib ole32.lib ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) EXTRA_DSO_LDOPTS += imagehlp.lib diff --git a/xpcom/build/malloc.c b/xpcom/build/malloc.c index cf6004928f12..9f64af25d161 100644 --- a/xpcom/build/malloc.c +++ b/xpcom/build/malloc.c @@ -268,7 +268,6 @@ #ifdef WIN32 -#define WIN32_LEAN_AND_MEAN #include /* Win32 doesn't supply or need the following headers */ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index 15c2b1ed0620..7f944ba95c26 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -92,7 +92,4 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM -ifeq ($(OS_ARCH), WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index 007051050d3e..9a244f8016b5 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -151,7 +151,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 diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in index 252ec6a5abe4..1dc9f3e9dcb4 100644 --- a/xpcom/glue/Makefile.in +++ b/xpcom/glue/Makefile.in @@ -69,7 +69,3 @@ export:: DEFINES += \ -D_IMPL_NS_COM - -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in index 2de4dc77606c..abfbd5c0b2b3 100644 --- a/xpcom/glue/standalone/Makefile.in +++ b/xpcom/glue/standalone/Makefile.in @@ -89,8 +89,4 @@ endif DEFINES += -DXPCOM_GLUE -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif - diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 8e4009b20160..11010d85e7d7 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -162,7 +162,4 @@ DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/proxy/src/Makefile.in b/xpcom/proxy/src/Makefile.in index 387ce7ee391b..bc20d9cf04d0 100644 --- a/xpcom/proxy/src/Makefile.in +++ b/xpcom/proxy/src/Makefile.in @@ -48,7 +48,3 @@ FORCE_STATIC_LIB = 1 FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in index 40b6f1a7ab08..6a5f784bac43 100644 --- a/xpcom/reflect/xptcall/src/Makefile.in +++ b/xpcom/reflect/xptcall/src/Makefile.in @@ -44,7 +44,3 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPTC_API -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif - diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in index 2e6804dc0f6e..21c963fbb091 100644 --- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in @@ -54,7 +54,3 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPTC_API LOCAL_INCLUDES = -I$(srcdir)/../.. - -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in index de043d2bb522..44fef9fe543b 100644 --- a/xpcom/reflect/xptcall/tests/Makefile.in +++ b/xpcom/reflect/xptcall/tests/Makefile.in @@ -45,8 +45,4 @@ ifeq ($(OS_ARCH),BSD_OS) OS_LIBS += -lgcc endif -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif - diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in index 2524089c54cf..ff1f797ea07c 100644 --- a/xpcom/reflect/xptinfo/src/Makefile.in +++ b/xpcom/reflect/xptinfo/src/Makefile.in @@ -56,7 +56,4 @@ include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../ds DEFINES += -DEXPORT_XPTI_API -DEXPORT_XPT_API -ifeq ($(OS_ARCH), WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/reflect/xptinfo/tests/Makefile.in b/xpcom/reflect/xptinfo/tests/Makefile.in index a1d1afc02435..177390b65052 100644 --- a/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/xpcom/reflect/xptinfo/tests/Makefile.in @@ -40,6 +40,3 @@ LIBS = \ include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPTI_API -ifeq ($(OS_ARCH), WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/string/obsolete/Makefile.in b/xpcom/string/obsolete/Makefile.in index fd9681be817a..080c45b1d20a 100644 --- a/xpcom/string/obsolete/Makefile.in +++ b/xpcom/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 diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index 7aa741c91139..5459354e5603 100644 --- a/xpcom/string/src/Makefile.in +++ b/xpcom/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 diff --git a/xpcom/tests/windows/TestCOM.cpp b/xpcom/tests/windows/TestCOM.cpp index 058fcab84584..9b55530adfe4 100644 --- a/xpcom/tests/windows/TestCOM.cpp +++ b/xpcom/tests/windows/TestCOM.cpp @@ -41,6 +41,9 @@ #include "nsISupports.h" #include "nsIFactory.h" +// unknwn.h is needed to build with WIN32_LEAN_AND_MEAN +#include + // {5846BA30-B856-11d1-A98A-00805F8A7AC4} #define NS_ITEST_COM_IID \ { 0x5846ba30, 0xb856, 0x11d1, \ diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index bcc8a1f59938..5dc2b22deac3 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -82,7 +82,4 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM -ifeq ($(OS_ARCH), WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/typelib/xpt/src/Makefile.in b/xpcom/typelib/xpt/src/Makefile.in index 4accdb2a393c..3cb5e1e2714f 100644 --- a/xpcom/typelib/xpt/src/Makefile.in +++ b/xpcom/typelib/xpt/src/Makefile.in @@ -47,10 +47,6 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPT_API HOST_CFLAGS += -DEXPORT_XPT_API -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif - # Build libxpt early so that it'll be available to xpidl, which also # must be built early. export:: libs diff --git a/xpcom/typelib/xpt/tests/Makefile.in b/xpcom/typelib/xpt/tests/Makefile.in index af2c1936ea89..acf180a04cd7 100644 --- a/xpcom/typelib/xpt/tests/Makefile.in +++ b/xpcom/typelib/xpt/tests/Makefile.in @@ -41,6 +41,3 @@ LIBS = \ include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPT_API -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpcom/typelib/xpt/tools/Makefile.in b/xpcom/typelib/xpt/tools/Makefile.in index 4ddc9b37182d..fe7f6899d520 100644 --- a/xpcom/typelib/xpt/tools/Makefile.in +++ b/xpcom/typelib/xpt/tools/Makefile.in @@ -47,7 +47,7 @@ include $(topsrcdir)/config/rules.mk # Compile directly against the static lib, so we can use the tools # during the build without the shared library path being set. ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API +DEFINES += -DEXPORT_XPT_API endif LIBS = $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index 145439aa0e65..7018ba20e25e 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/xpfe/appshell/src/Makefile.in @@ -83,7 +83,6 @@ endif endif ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN EXTRA_DSO_LIBS = gkgfx endif diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in index 599acd2db69c..7c7b3db777e6 100644 --- a/xpfe/bootstrap/Makefile.in +++ b/xpfe/bootstrap/Makefile.in @@ -170,7 +170,6 @@ endif ifeq ($(MOZ_WIDGET_TOOLKIT),windows) RCINCLUDE = splash.rc -DEFINES += -DWIN32_LEAN_AND_MEAN CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp OS_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib winspool.lib endif diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in index e2ac403af659..e5eb48479b12 100644 --- a/xpfe/browser/src/Makefile.in +++ b/xpfe/browser/src/Makefile.in @@ -66,7 +66,3 @@ EXTRA_DSO_LDOPTS = \ $(NULL) include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -endif diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index 11c265c99362..bcbb775e3933 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -111,7 +111,6 @@ LOCAL_INCLUDES += \ endif ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN SHARED_LIBRARY_LIBS += \ $(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \ diff --git a/xpinstall/cleanup/Makefile.in b/xpinstall/cleanup/Makefile.in index dd9c89947734..c53b34ee5c66 100644 --- a/xpinstall/cleanup/Makefile.in +++ b/xpinstall/cleanup/Makefile.in @@ -68,7 +68,6 @@ LDFLAGS += $(TK_LIBS) endif ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN LDFLAGS += /SUBSYSTEM:WINDOWS endif diff --git a/xpinstall/src/Makefile.in b/xpinstall/src/Makefile.in index eac494786b48..46bbf0bea476 100644 --- a/xpinstall/src/Makefile.in +++ b/xpinstall/src/Makefile.in @@ -122,6 +122,6 @@ EXTRA_DSO_LDOPTS = \ include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) -DEFINES += -DWIN32_LEAN_AND_MEAN -DZLIB_DLL +DEFINES += -DZLIB_DLL endif diff --git a/xpinstall/wizard/windows/nsinstall/nsinstall.cpp b/xpinstall/wizard/windows/nsinstall/nsinstall.cpp index cb058326d2e6..d4f8eb86010c 100644 --- a/xpinstall/wizard/windows/nsinstall/nsinstall.cpp +++ b/xpinstall/wizard/windows/nsinstall/nsinstall.cpp @@ -24,6 +24,11 @@ */ #include + +// stdlib.h and malloc.h are needed to build with WIN32_LEAN_AND_MEAN +#include +#include + #include "resource.h" #include "zlib.h" diff --git a/xpinstall/wizard/windows/setup/dialogs.c b/xpinstall/wizard/windows/setup/dialogs.c index eb83f4024102..aa02d39433e2 100644 --- a/xpinstall/wizard/windows/setup/dialogs.c +++ b/xpinstall/wizard/windows/setup/dialogs.c @@ -33,6 +33,9 @@ #include #include +// commdlg.h is needed to build with WIN32_LEAN_AND_MEAN +#include + static WNDPROC OldListBoxWndProc; static BOOL gbProcessingXpnstallFiles; static DWORD gdwACFlag; diff --git a/xpinstall/wizard/windows/setup/extra.c b/xpinstall/wizard/windows/setup/extra.c index 904bd7e6760e..9e942352eaff 100644 --- a/xpinstall/wizard/windows/setup/extra.c +++ b/xpinstall/wizard/windows/setup/extra.c @@ -37,6 +37,9 @@ #include #include +// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #define HIDWORD(l) ((DWORD) (((ULONG) (l) >> 32) & 0xFFFF)) #define LODWORD(l) ((DWORD) (l)) diff --git a/xpinstall/wizard/windows/uninstall/extra.c b/xpinstall/wizard/windows/uninstall/extra.c index 156d3061e116..3e08c1fce59f 100644 --- a/xpinstall/wizard/windows/uninstall/extra.c +++ b/xpinstall/wizard/windows/uninstall/extra.c @@ -29,6 +29,9 @@ #include "ifuncns.h" #include +// shellapi.h is needed to build with WIN32_LEAN_AND_MEAN +#include + #define HIDWORD(l) ((DWORD) (((ULONG) (l) >> 32) & 0xFFFF)) #define LODWORD(l) ((DWORD) (l))