summaryrefslogtreecommitdiffstats
path: root/toolkit/components/build
diff options
context:
space:
mode:
authorGaming4JC <g4jc@bulletmail.org>2018-10-25 18:12:58 -0400
committerGaming4JC <g4jc@bulletmail.org>2018-10-25 18:12:58 -0400
commit6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe (patch)
treeb5ed402996e73e08ebec26e5476a0b3a15c42b3b /toolkit/components/build
parentb927e0d5caad3a7703829bdc1093bfc67ef3fb97 (diff)
downloadUXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar.gz
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar.lz
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.tar.xz
UXP-6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe.zip
Issue #795 - Make nsIUserInfo component optional
This allows the nsIUserinfo component to be disabled with --disable-userinfo in mozconfig at build time, but leaves it on by default to avoid any compatibility issues in existing applications.
Diffstat (limited to 'toolkit/components/build')
-rw-r--r--toolkit/components/build/nsToolkitCompsModule.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp
index 190c4da06..33c604c4e 100644
--- a/toolkit/components/build/nsToolkitCompsModule.cpp
+++ b/toolkit/components/build/nsToolkitCompsModule.cpp
@@ -5,7 +5,9 @@
#include "mozilla/ModuleUtils.h"
#include "nsAppStartup.h"
#include "nsNetCID.h"
+#ifdef MOZ_USERINFO
#include "nsUserInfo.h"
+#endif
#include "nsToolkitCompsCID.h"
#include "nsFindService.h"
#if defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID)
@@ -76,7 +78,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPerformanceStatsService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTerminator)
#endif
+#if defined(MOZ_USERINFO)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
+#endif // defined (MOZ_USERINFO)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService)
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -141,7 +145,9 @@ NS_DEFINE_NAMED_CID(NS_TOOLKIT_PERFORMANCESTATSSERVICE_CID);
#if defined(MOZ_HAS_TERMINATOR)
NS_DEFINE_NAMED_CID(NS_TOOLKIT_TERMINATOR_CID);
#endif
+#if defined(MOZ_USERINFO)
NS_DEFINE_NAMED_CID(NS_USERINFO_CID);
+#endif // defined (MOZ_USERINFO)
NS_DEFINE_NAMED_CID(ALERT_NOTIFICATION_CID);
NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID);
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -179,7 +185,9 @@ static const Module::CIDEntry kToolkitCIDs[] = {
#if defined(MOZ_HAS_PERFSTATS)
{ &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID, false, nullptr, nsPerformanceStatsServiceConstructor },
#endif // defined (MOZ_HAS_PERFSTATS)
+#if defined(MOZ_USERINFO)
{ &kNS_USERINFO_CID, false, nullptr, nsUserInfoConstructor },
+#endif // defined (MOZ_USERINFO)
{ &kALERT_NOTIFICATION_CID, false, nullptr, AlertNotificationConstructor },
{ &kNS_ALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor },
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -219,7 +227,9 @@ static const Module::ContractIDEntry kToolkitContracts[] = {
#if defined(MOZ_HAS_PERFSTATS)
{ NS_TOOLKIT_PERFORMANCESTATSSERVICE_CONTRACTID, &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID },
#endif // defined (MOZ_HAS_PERFSTATS)
+#if defined(MOZ_USERINFO)
{ NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID },
+#endif // defined(MOZ_USERINFO)
{ ALERT_NOTIFICATION_CONTRACTID, &kALERT_NOTIFICATION_CID },
{ NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID },
#if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)