Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 11946d4

Browse files
committed
Bug 846540 - Remove dead code from mozilla-central to let comm-central build. r=Standard8, NPOTFFB.
Note that the actual implementation of code that would be used can be found in comm-central's ldap/xpcom part of the library.
1 parent e773485 commit 11946d4

6 files changed

Lines changed: 0 additions & 550 deletions

File tree

extensions/pref/autoconfig/public/moz.build

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,3 @@ XPIDL_SOURCES += [
77
'nsIAutoConfig.idl',
88
'nsIReadConfig.idl',
99
]
10-
11-
if CONFIG['MOZ_LDAP_XPCOM']:
12-
XPIDL_SOURCES += [
13-
'nsILDAPSyncQuery.idl',
14-
]
15-

extensions/pref/autoconfig/public/nsILDAPSyncQuery.idl

Lines changed: 0 additions & 27 deletions
This file was deleted.

extensions/pref/autoconfig/src/Makefile.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ CPPSRCS = nsReadConfig.cpp \
2626
nsJSConfigTriggers.cpp \
2727
$(NULL)
2828

29-
ifdef MOZ_LDAP_XPCOM
30-
DEFINES += -DMOZ_LDAP_XPCOM
31-
CPPSRCS += nsLDAPSyncQuery.cpp
32-
endif
33-
3429
AUTOCFG_JS_EXPORTS = \
3530
$(srcdir)/prefcalls.js \
3631
$(NULL)

extensions/pref/autoconfig/src/nsConfigFactory.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,22 @@
77
#include "nsAutoConfig.h"
88
#include "nsReadConfig.h"
99
#include "nsIAppStartupNotifier.h"
10-
#if defined(MOZ_LDAP_XPCOM)
11-
#include "nsLDAPSyncQuery.h"
12-
#endif
1310

1411
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAutoConfig, Init)
1512
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsReadConfig, Init)
16-
#if defined(MOZ_LDAP_XPCOM)
17-
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPSyncQuery)
18-
#endif
1913

2014
NS_DEFINE_NAMED_CID(NS_AUTOCONFIG_CID);
2115
NS_DEFINE_NAMED_CID(NS_READCONFIG_CID);
22-
#if defined(MOZ_LDAP_XPCOM)
23-
NS_DEFINE_NAMED_CID(NS_LDAPSYNCQUERY_CID);
24-
#endif
2516

2617
static const mozilla::Module::CIDEntry kAutoConfigCIDs[] = {
2718
{ &kNS_AUTOCONFIG_CID, false, NULL, nsAutoConfigConstructor },
2819
{ &kNS_READCONFIG_CID, false, NULL, nsReadConfigConstructor },
29-
#if defined(MOZ_LDAP_XPCOM)
30-
{ &kNS_LDAPSYNCQUERY_CID, false, NULL, nsLDAPSyncQueryConstructor },
31-
#endif
3220
{ NULL }
3321
};
3422

3523
static const mozilla::Module::ContractIDEntry kAutoConfigContracts[] = {
3624
{ NS_AUTOCONFIG_CONTRACTID, &kNS_AUTOCONFIG_CID },
3725
{ NS_READCONFIG_CONTRACTID, &kNS_READCONFIG_CID },
38-
#if defined(MOZ_LDAP_XPCOM)
39-
{ "@mozilla.org/ldapsyncquery;1", &kNS_LDAPSYNCQUERY_CID },
40-
#endif
4126
{ NULL }
4227
};
4328

0 commit comments

Comments
 (0)