clean out some old crud from ap_config.h

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88296 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_config.h b/include/ap_config.h
index eac7483cee0377d4429276f0656a0fe90092a4cc..82e5fd1226f8b09dc52f403d26ed2bffb83a8ae1 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -232,22 +232,7 @@
 #define NO_LINGCLOSE
 #endif
 
-/* XXX - The PHP4 comments say -D_HPUX_SOURCE is obsolete. */
-
-/* TODO - none of the dynamic linking defines are in yet, but that's because
- * Manoj needs to learn what the exact ramifications of libtool on DSOs are */
-
-#undef PACKAGE
-#undef VERSION
-
-#if APR_FILE_BASED_SHM
-#define AP_USE_FILE_BASED_SCOREBOARD
-#else
-#define AP_USE_MEM_BASED_SCOREBOARD
-#endif
-
-/* If APR has OTHER_CHILD logic, use reliable piped logs.
- */
+/* If APR has OTHER_CHILD logic, use reliable piped logs. */
 #if APR_HAS_OTHER_CHILD
 #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
 #endif

diff --git a/include/scoreboard.h b/include/scoreboard.h
index 70588a1dba6a8aa7bbfd8a4ca971ac4bba623163..91cbcf20b1098032bbd75fe8147c4cc3f2814617 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -74,8 +74,8 @@ extern "C" {
 #include "apr_thread_proc.h"
 #include "apr_portable.h"
 
-/*The optimized timeout code only works if we're not using a scoreboard file*/
-#if defined(AP_USE_MEM_BASED_SCOREBOARD)
+/* The optimized timeouts only work if we're not using a scoreboard file */
+#if !APR_FILE_BASED_SHM
 #define OPTIMIZE_TIMEOUTS
 #endif
 

diff --git a/server/main.c b/server/main.c
index 8f4c2075cc42eba984d12abb539c2366cbf3f421..93e83fcbc665c5883106ac27eaa35fdf4907055a 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -102,15 +102,12 @@ static void show_compile_settings(void)
 #ifdef HAVE_SHMGET
     printf(" -D HAVE_SHMGET\n");
 #endif
-#ifdef AP_USE_FILE_BASED_SCOREBOARD
-    printf(" -D AP_USE_FILE_BASED_SCOREBOARD\n");
+#if APR_FILE_BASED_SHM
+    printf(" -D APR_FILE_BASED_SHM\n");
 #endif
-#ifdef AP_USE_MEM_BASED_SCOREBOARD
-    printf(" -D AP_USE_MEM_BASED_SCOREBOARD\n");
-#endif
-#ifdef APR_HAS_MMAP
+#if APR_HAS_MMAP
     printf(" -D APR_HAS_MMAP\n");
-#endif /*APR_HAS_MMAP*/
+#endif
 #ifdef NO_WRITEV
     printf(" -D NO_WRITEV\n");
 #endif