From b3c6959aa9b4d18bf43f42c98186a2fb9956ffe1 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Fri, 15 Jun 2001 06:19:24 +0000 Subject: [PATCH] Remove workaround for WS6 bug in-lieu of vendor patch listed at http://www.mozilla.org/unix/solaris-build.html . Thanks to Rich Burridge for the patch. Bug #73834 r=dmose sr=alecf a=asa --- directory/xpcom/base/src/nsLDAPMessage.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/directory/xpcom/base/src/nsLDAPMessage.cpp b/directory/xpcom/base/src/nsLDAPMessage.cpp index 0c555852ce14..665535950d4c 100644 --- a/directory/xpcom/base/src/nsLDAPMessage.cpp +++ b/directory/xpcom/base/src/nsLDAPMessage.cpp @@ -60,13 +60,11 @@ nsLDAPMessage::~nsLDAPMessage(void) if (mMsgHandle) { int rc = ldap_msgfree(mMsgHandle); -// for some reason, the following switch statement is causing Sun's Forte 6 -// Update 1 (CC -v sez "CC: Sun WorkShop 6 update 1 C++ 5.2 Patch 109508-01 -// 2001/01/31") to crash during the compile. Since all it does is log -// something which is pretty unlikely to happen anyway, I'm gonna ifdef this -// code out on that compiler. -// -#if __SUNPRO_CC != 0x520 +// If you are having problems compiling the following code on a Solaris +// machine with the Forte 6 Update 1 compilers, then you need to make +// sure you have applied all the required patches. See: +// http://www.mozilla.org/unix/solaris-build.html for more details. + switch(rc) { case LDAP_RES_BIND: case LDAP_RES_SEARCH_ENTRY: @@ -96,7 +94,6 @@ nsLDAPMessage::~nsLDAPMessage(void) "failed: %s\n", ldap_err2string(rc))); break; } -#endif /* __SUNPRO_CC */ } if (mMatchedDn) {