Commit 3ea17857 authored by Greg Stein's avatar Greg Stein
Browse files

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
parent 1924da24

include/ap_config.h

+1 −16
Original line number Diff line number Diff line
@@ -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

include/scoreboard.h

+2 −2
Original line number Diff line number Diff line
@@ -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

server/main.c

+4 −7
Original line number Diff line number Diff line
@@ -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