From b59a41efad5f12734da18d7ef20ce32450e5b969 Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.demon.co.uk" <bugzilla%standard8.demon.co.uk>
Date: Tue, 31 Jan 2006 18:05:12 +0000
Subject: [PATCH] Follow-up to moving ldap autocomplete code to
 mailnews/addrbook - remove some ifdefs and defines that are no longer
 required. Bug 263042. r=bsmedberg.

---
 mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp | 11 -----------
 mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp | 11 -----------
 xpfe/components/build/Makefile.in                   |  5 -----
 xpfe/components/build2/Makefile.in                  |  5 -----
 4 files changed, 32 deletions(-)

diff --git a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
index 09f4f9cab801..b3cdc4596ba9 100644
--- a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
@@ -37,15 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// Work around lack of conditional build logic in codewarrior's
-// build system.  The MOZ_LDAP_XPCOM preprocessor symbol is only 
-// defined on Mac because noone else needs this weirdness; thus 
-// the XP_MAC check first.  This conditional encloses the entire
-// file, so that in the case where the ldap option is turned off
-// in the mac build, a dummy (empty) object will be generated.
-//
-#if !defined(XP_MAC) || defined(MOZ_LDAP_XPCOM)
-
 #include "nsAbLDAPAutoCompFormatter.h"
 #include "nsIAutoCompleteResults.h"
 #include "nsIServiceManager.h"
@@ -742,5 +733,3 @@ nsAbLDAPAutoCompFormatter::SetCommentFormat(const nsAString &
 
     return NS_OK;
 }
-
-#endif
diff --git a/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp b/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
index e6cffe10c637..c86368313ca8 100644
--- a/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
+++ b/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
@@ -38,15 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// Work around lack of conditional build logic in codewarrior's
-// build system.  The MOZ_LDAP_XPCOM preprocessor symbol is only 
-// defined on Mac because noone else needs this weirdness; thus 
-// the XP_MAC check first.  This conditional encloses the entire
-// file, so that in the case where the ldap option is turned off
-// in the mac build, a dummy (empty) object will be generated.
-//
-#if !defined(XP_MAC) || defined(MOZ_LDAP_XPCOM)
-
 #include "nsString.h"
 #include "nsLDAPAutoCompleteSession.h"
 #include "nsIComponentManager.h"
@@ -1654,5 +1645,3 @@ nsLDAPAutoCompleteSession::SetSearchClientControls(nsIMutableArray *aControls)
     mSearchClientControls = aControls;
     return NS_OK;
 }
-
-#endif
diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in
index eb36d64723a6..d5d8d20abca3 100644
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -90,11 +90,6 @@ endif
 
 CPPSRCS		= nsModule.cpp
 
-ifdef MOZ_LDAP_XPCOM
-REQUIRES	+= mozldap
-DEFINES		+= -DMOZ_LDAP_XPCOM
-endif
-
 ifdef MOZ_PERF_METRICS
 EXTRA_DSO_LIBS	+= mozutil_s
 endif
diff --git a/xpfe/components/build2/Makefile.in b/xpfe/components/build2/Makefile.in
index 2c95cc777281..d8868a21fe27 100644
--- a/xpfe/components/build2/Makefile.in
+++ b/xpfe/components/build2/Makefile.in
@@ -73,11 +73,6 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsModule.cpp
 
-ifdef MOZ_LDAP_XPCOM
-REQUIRES	+= mozldap
-DEFINES		+= -DMOZ_LDAP_XPCOM
-endif
-
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)windowds_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)downloadmanager_s.$(LIB_SUFFIX) \