httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0/server main.c
Date Sat, 24 Feb 2001 03:40:51 GMT
gstein      01/02/23 19:40:51

  Modified:    include  ap_config.h scoreboard.h
               server   main.c
  Log:
  clean out some old crud from ap_config.h
  
  Revision  Changes    Path
  1.58      +1 -16     httpd-2.0/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_config.h,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -u -r1.57 -r1.58
  --- ap_config.h	2001/02/21 01:18:39	1.57
  +++ ap_config.h	2001/02/24 03:40:47	1.58
  @@ -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
  
  
  
  1.14      +2 -2      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- scoreboard.h	2001/02/16 04:26:31	1.13
  +++ scoreboard.h	2001/02/24 03:40:48	1.14
  @@ -74,8 +74,8 @@
   #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
   
  
  
  
  1.96      +4 -7      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -u -r1.95 -r1.96
  --- main.c	2001/02/23 18:17:16	1.95
  +++ main.c	2001/02/24 03:40:50	1.96
  @@ -102,15 +102,12 @@
   #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
  
  
  

Mime
View raw message