Bug 425979 - "Win2003 SDK and MinGW build error in ../mozilla/toolkit/components/parentalcontrols/src/nsParentalControlsServiceWin.cpp (add --disable-parental-controls)" [p=jmathies@mozilla.com (Jim Mathies) r=bsmedberg a1.9=beltzner]

toolkit/components/build/Makefile.in

@@ -110,6 +110,7 @@ SHARED_LIBRARY_LIBS = \
 	../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
 	$(NULL)
 
+ifndef MOZ_DISABLE_PARENTAL_CONTROLS
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 SHARED_LIBRARY_LIBS += ../parentalcontrols/src/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += \
@@ -117,6 +118,7 @@ LOCAL_INCLUDES += \
 	$(NULL)
 REQUIRES += parentalcontrols
 endif
+endif
 
 ifndef MOZ_SUITE
 # XXX Suite isn't ready to build this just yet

toolkit/components/build/nsToolkitCompsModule.cpp

@@ -41,7 +41,7 @@
 #include "nsXPFEComponentsCID.h"
 #include "nsToolkitCompsCID.h"
 
-#ifdef XP_WIN
+#if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 #include "nsParentalControlsServiceWin.h"
 #endif
 
@@ -76,7 +76,7 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAppStartup, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
 
-#ifdef XP_WIN
+#if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsParentalControlsServiceWin)
 #endif
 
@@ -143,7 +143,7 @@ static const nsModuleComponentInfo components[] =
     NS_ALERTSERVICE_CONTRACTID,
     nsAlertsServiceConstructor },
 #endif
-#ifdef XP_WIN
+#if defined(XP_WIN) && !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
   { "Parental Controls Service",
     NS_PARENTALCONTROLSSERVICE_CID,
     NS_PARENTALCONTROLSSERVICE_CONTRACTID,

toolkit/components/parentalcontrols/Makefile.in

@@ -45,9 +45,11 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = public
 
+ifndef MOZ_DISABLE_PARENTAL_CONTROLS
 ifeq (WINNT,$(OS_ARCH))
 DIRS += src
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk