From 22aa606422a24c1300542551c4810f9b9762b107 Mon Sep 17 00:00:00 2001 From: "dmose%netscape.com" Date: Tue, 15 Nov 2005 20:08:31 +0000 Subject: [PATCH] Tweak Mac build system to make nsLDAPAutoCompleteSession.cpp and friends compile when "options ldap" is on (bug 70933). r=peterv@netscape.com, sr=smfr@netscape.com. --- mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp b/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp index bab3bb98ae69..959278ce1b6b 100644 --- a/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp +++ b/mailnews/addrbook/src/nsLDAPAutoCompleteSession.cpp @@ -21,6 +21,16 @@ * */ + +// 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 "nsLDAPAutoCompleteSession.h" #include "nsIComponentManager.h" #include "nsIConsoleService.h" @@ -1017,3 +1027,5 @@ nsLDAPAutoCompleteSession::SetServerURL(nsILDAPURL * aServerURL) return NS_OK; } + +#endif