Resolves: #214728

Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro MCC_HTTPD (Comment #14)

include/base/systems.h

@@ -509,7 +509,7 @@ typedef void* PASSWD;
 /* NS_MAIL builds sec-key.c which calls systhread_init, which requires */
 /* that USE_NSPR is defined when systhr.c is compiled.  --lachman */
 /* MCC_PROXY does the same thing now --nbreslow -- LIKE HELL --ari */
-#if (defined(MCC_HTTPD) || defined(MCC_ADMSERV) || defined(MCC_PROXY) || defined(NS_MAIL)) && defined(XP_UNIX)
+#if defined(XP_UNIX)
 #define USE_NSPR
 /* XXXrobm This is UNIX-only for the moment */
 #define LOG_BUFFERING
@@ -520,10 +520,10 @@ typedef void* PASSWD;
 #ifdef IRIX 
 #undef SEM_FLOCK
 #define SEM_IRIX
-#endif 
-#endif
+#endif /* IRIX */
+#endif /* SW_THREADS */
 #define THREAD_ANY
-#endif
+#endif /* XP_UNIX */
 
 /* --- End the great debate --- */
 

ldap/clients/dsgw/Versiongw.c

@@ -36,10 +36,6 @@
  * All rights reserved.
   --- END COPYRIGHT BLOCK ---  */
 
-#if defined( XP_WIN32 )
-#undef MCC_HTTPD
-#endif
-
 #include "netsite.h"			/* to get MAGNUS_VERSION_STRING */
 
 #ifdef MAGNUS_VERSION_STRING

lib/base/system.cpp

@@ -53,7 +53,7 @@
 
 static int thread_malloc_key = -1;
 
-#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY)
+#if defined(MALLOC_POOLS) && defined(THREAD_ANY)
 #include "base/pool.h"
 #include "base/systhr.h"
 
@@ -85,7 +85,7 @@ static int thread_malloc_key = -1;
 
 NSAPI_PUBLIC void *system_malloc(int size)
 {
-#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY)
+#if defined(MALLOC_POOLS) && defined(THREAD_ANY)
     return pool_malloc(MALLOC_KEY, size);
 #else
     return malloc(size);
@@ -96,7 +96,7 @@ NSAPI_PUBLIC void *system_malloc(int size)
 NSAPI_PUBLIC void *system_calloc(int size)
 {
     void *ret;
-#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY)
+#if defined(MALLOC_POOLS) && defined(THREAD_ANY)
     ret = pool_malloc(MALLOC_KEY, size);
 #else
     ret = malloc(size);
@@ -109,7 +109,7 @@ NSAPI_PUBLIC void *system_calloc(int size)
 
 NSAPI_PUBLIC void *system_realloc(void *ptr, int size)
 {
-#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY)
+#if defined(MALLOC_POOLS) && defined(THREAD_ANY)
     return pool_realloc(MALLOC_KEY, ptr, size);
 #else
     return realloc(ptr, size);
@@ -119,7 +119,7 @@ NSAPI_PUBLIC void *system_realloc(void *ptr, int size)
 
 NSAPI_PUBLIC void system_free(void *ptr)
 {
-#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY)
+#if defined(MALLOC_POOLS) && defined(THREAD_ANY)
     pool_free(MALLOC_KEY, ptr);
 #else
     PR_ASSERT(ptr);
@@ -130,7 +130,7 @@ NSAPI_PUBLIC void system_free(void *ptr)
 NSAPI_PUBLIC char *system_strdup(const char *ptr)
 {
     PR_ASSERT(ptr);
-#if defined(MALLOC_POOLS) && defined(MCC_HTTPD) && defined(THREAD_ANY)
+#if defined(MALLOC_POOLS) && defined(THREAD_ANY)
     return pool_strdup(MALLOC_KEY, ptr);
 #else
     return strdup(ptr);