[Fedora-directory-commits] ldapserver/lib/base system.cpp,1.7,1.8

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082/lib/base

Modified Files:
	system.cpp 
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro MCC_HTTPD (Comment #14)



Index: system.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/base/system.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system.cpp	19 Apr 2005 22:07:45 -0000	1.7
+++ system.cpp	10 Nov 2006 01:42:39 -0000	1.8
@@ -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 @@
 
 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_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_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_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 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);