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

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 \

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)

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 \

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 \

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 \

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

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 \

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 \

content/xsl/document/src/Makefile.in

@@ -1,58 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE       = content
-LIBRARY_NAME = gkconxsldoc_s
-REQUIRES	= xpcom \
-		  string \
-		  htmlparser \
-		  view \
-		  widget \
-		  dom \
-		  necko \
-		  gfx \
-		  layout \
-		  content \
-		  $(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES	+= -DWIN32_LEAN_AND_MEAN
-endif
-
-CPPSRCS =				\
-	nsXSLContentSink.cpp			\
-	nsTransformMediator.cpp			\
-	$(NULL)
-
-LOCAL_INCLUDES = 				\
-	-I$(srcdir)/../../../xml/document/src	\
-	$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-

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 \

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 \

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)

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
-

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
-

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"

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"

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

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

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

embedding/tests/winEmbed/StdAfx.h

@@ -1,61 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: Mozilla-sample-code 1.0
- *
- * Copyright (c) 2002 Netscape Communications Corporation and
- * other contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this Mozilla sample software and associated documentation files
- * (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** */
-
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
-
-// Windows Header Files:
-#include <windows.h>
-
-// C RunTime Header Files
-#include <stdlib.h>
-#include <malloc.h>
-#include <memory.h>
-#include <tchar.h>
-
-// Local Header Files
-
-// TODO: reference additional headers your program requires here
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)

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
-

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
-

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

extensions/inspector/base/src/win/Makefile.in

@@ -1,53 +0,0 @@
-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH=../../../../..
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE=inspector
-LIBRARY_NAME=inscreencap_s
-REQUIRES	= xpcom \
-		  string \
-		  gfx \
-		  layout \
-		  widget \
-		  content \
-		  locale \
-		  dom \
-		  necko \
-		  $(NULL)
-
-CPPSRCS = inScreenCapturer.cpp 
-
-LOCAL_INCLUDES	= -I$(srcdir)/..
-
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif

extensions/interfaceinfo/src/Makefile.in

@@ -1,76 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   John Bandhauer <jband@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= iiextras
-LIBRARY_NAME	= iiextras
-EXPORT_LIBRARY = 1
-SHORT_LIBNAME	= iiextras
-IS_COMPONENT	= 1
-MODULE_NAME	= iiextras
-ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME	= iiextras
-SHORT_LIBNAME	= iiextras
-endif
-
-REQUIRES	= xpcom \
-		  string \
-		  $(NULL)
-
-CPPSRCS		= \
-	nsGenericInterfaceInfoSet.cpp	\
-	nsScriptableInterfaceInfo.cpp	\
-	iixmodule.cpp	\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-EXTRA_COMPONENTS = nsInterfaceInfoToIDL.js
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif
-

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

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
-

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

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

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

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

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
-

extensions/xmlextras/schema/src/Makefile.in

@@ -1,62 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= xmlextras
-LIBRARY_NAME	= xmlextrasschema_s
-
-REQUIRES	= xpcom \
-		  string \
-		  dom \
-		  xpconnect \
-		  caps \
-		  widget \
-		  content \
-		  js \
-		  necko \
-		  $(NULL)
-
-CPPSRCS	= 				\
-		nsSchema.cpp				\
-		nsSchemaComponentBase.cpp		\
-		nsSchemaSimpleTypes.cpp			\
-		nsSchemaComplexType.cpp			\
-		nsSchemaParticles.cpp			\
-		nsSchemaAttributes.cpp			\
-		nsSchemaLoader.cpp			\
-		nsSOAPTypes.cpp				\
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif

extensions/xmlextras/soap/src/Makefile.in

@@ -1,80 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: NPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is 
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the NPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the NPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK ***** *
-
-DEPTH                = ../../../..
-topsrcdir        = @top_srcdir@
-srcdir                = @srcdir@
-VPATH                = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE                = xmlextras
-LIBRARY_NAME        = xmlextrassoap_s
-REQUIRES	= xpcom \
-		  string \
-		  caps \
-		  dom \
-		  js \
-		  xpconnect \
-		  necko \
-		  $(NULL)
-
-CPPSRCS        =                                 \
-                nsDefaultSOAPEncoder.cpp\
-                nsHTTPSOAPTransport.cpp        \
-                nsSOAPBlock.cpp                \
-                nsSOAPCall.cpp                \
-                nsSOAPEncoding.cpp        \
-                nsSOAPException.cpp        \
-                nsSOAPFault.cpp                \
-                nsSOAPHeaderBlock.cpp        \
-                nsSOAPMessage.cpp        \
-                nsSOAPParameter.cpp        \
-                nsSOAPPropertyBag.cpp        \
-                nsSOAPResponse.cpp        \
-                nsSOAPUtils.cpp                \
-                $(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES                += -DWIN32_LEAN_AND_MEAN
-endif

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

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

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) \

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

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

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

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

intl/locale/src/windows/Makefile.in

@@ -47,5 +47,3 @@ CPPSRCS		= \
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
-
-DEFINES		+= -DWIN32_LEAN_AND_MEAN

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
-

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
 

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

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

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
-

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

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

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

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
-

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

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 \

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

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

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

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

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
 

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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	= \

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 \

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"

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

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
 

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
 

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

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

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

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

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
-

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

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

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

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

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

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

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

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

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

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
 

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

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

string/obsolete/Makefile.in

@@ -1,65 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Johnny Stenback <jst@netscape.com> (original author)
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= string
-LIBRARY_NAME	= string_obsolete_s
-
-REQUIRES	=  \
-		  xpcom \
-		  $(NULL)
-
-CPPSRCS		=			\
-		nsStr.cpp		\
-		nsString.cpp		\
-		nsString2.cpp		\
-		$(NULL)
-
-EXPORTS		=			\
-		nsStr.h			\
-		nsStrShared.h           \
-		nsString.h		\
-		nsString2.h		\
-		$(NULL)			
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-# Force use of PIC
-FORCE_USE_PIC	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_COM
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif

string/src/Makefile.in

@@ -1,67 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications.  Portions created by Netscape Communications are
-# Copyright (C) 2001 by Netscape Communications.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Johnny Stenback <jst@netscape.com> (original author)
-#   Scott Collins <scc@mozilla.org>
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= string
-LIBRARY_NAME	= string_s
-
-REQUIRES	= xpcom \
-		  $(NULL)
-
-CPPSRCS		=				\
-		nsASingleFragmentString.cpp	\
-		nsAString.cpp			\
-		nsDependentConcatenation.cpp	\
-		nsDependentSubstring.cpp	\
-		nsFragmentedString.cpp		\
-		nsPrintfCString.cpp		\
-		nsPromiseFlatString.cpp		\
-		nsReadableUtils.cpp		\
-		nsSharableString.cpp		\
-		nsSharedBufferList.cpp		\
-		nsSlidingString.cpp		\
-		nsXPIDLString.cpp		\
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
-# Force use of PIC
-FORCE_USE_PIC	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_COM
-
-ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DWIN32_LEAN_AND_MEAN
-endif

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);

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

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"

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"

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>
+
 
 //-------------------------------------------------------------------------
 //

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"

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"

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

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"