Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow-up to moving ldap autocomplete code to mailnews/addrbook - remove some ifdefs and defines that are no longer required. Bug 263042. r=bsmedberg.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@188582 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.demon.co.uk 2006-01-31 18:05:12 +00:00
parent 1a63c41fc2
commit 2ebdd6f304
4 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
View File

@ -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

11
mozilla/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp
View File

@ -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

5
mozilla/xpfe/components/build/Makefile.in
View File

@ -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

5
mozilla/xpfe/components/build2/Makefile.in
View File

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