httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr.h.in apr_thread_proc.h
Date Mon, 01 May 2000 21:22:47 GMT
rbb         00/05/01 14:22:47

  Modified:    src/lib/apr configure.in
               src/lib/apr/include apr.h.in apr_thread_proc.h
  Log:
  Add options to APR to allow OTHER_CHILD support to be turned on and off.
  
  Revision  Changes    Path
  1.82      +16 -4     apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- configure.in	2000/04/30 20:49:28	1.81
  +++ configure.in	2000/05/01 21:22:44	1.82
  @@ -60,8 +60,7 @@
   AC_ARG_WITH(optim,[  --with-optim="FLAGS"      compiler optimisation flags],
           [OPTIM="$withval"])
   
  -AC_ARG_WITH(debug,[  --with-debug              Turn on debugging and compile tim
  -e warnings],
  +AC_ARG_WITH(debug,[  --with-debug            Turn on debugging and compile time warnings],
           [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else CFLAGS="$CFLAGS -g";
fi])
   
   dnl # this is the place to put specific options for platform/compiler
  @@ -313,7 +312,7 @@
   echo $ac_n "${nl}Checking for Threads...${nl}"
   AC_CACHE_CHECK([for threads], ac_cv_enable_threads,
     [ AC_ARG_ENABLE(threads,
  -    [  --enable-threads  Enable threading support in APR.],
  +    [  --enable-threads        Enable threading support in APR.],
       [ ac_cv_enable_threads=$enableval] ,
       [ AC_CHECK_HEADERS(pthread.h,
                      [ ac_cv_enable_threads="pthread" ] ,
  @@ -362,6 +361,19 @@
   
   AC_SUBST(threads)
   
  +dnl #----------------------------- Checking for Processes
  +echo $ac_n "${nl}Checking for Processes...${nl}"
  +AC_ARG_ENABLE(other-child,
  +  [  --enable-other-child    Enable reliable child processes ],
  +  [ if test "$enableval" = "yes"; then
  +        oc="1"
  +    else
  +        oc="0"
  +    fi ],
  +  [ oc=1 ] ) 
  +  
  +AC_SUBST(oc) 
  +
   dnl #----------------------------- Checking for MMAP 
   echo $ac_n "${nl}Checking for MMAP...${nl}"
   AC_FUNC_MMAP
  @@ -453,7 +465,7 @@
   
   AC_MSG_CHECKING(Checking for Shared memory support)
   AC_ARG_ENABLE(shmem,
  -  [ --enable-shmem  Enable shared memory support in APR. ],
  +  [  --enable-shmem          Enable shared memory support in APR. ],
     [ ],
     ac_cv_enable_shmem="mm" )
   
  
  
  
  1.20      +1 -0      apache-2.0/src/lib/apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- apr.h.in	2000/04/20 02:03:11	1.19
  +++ apr.h.in	2000/05/01 21:22:45	1.20
  @@ -63,6 +63,7 @@
   #define APR_HAS_FORK              @fork@
   #define APR_HAS_RANDOM            @rand@
   #define APR_HAS_XLATE             @iconv@
  +#define APR_HAS_OTHER_CHILD       @oc@
   
   /* Typedefs that APR needs. */
   
  
  
  
  1.27      +6 -0      apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- apr_thread_proc.h	2000/04/24 21:50:17	1.26
  +++ apr_thread_proc.h	2000/05/01 21:22:46	1.27
  @@ -72,6 +72,7 @@
   #define APR_PARENT_BLOCK     3
   #define APR_CHILD_BLOCK      4
   
  +#if APR_HAS_OTHER_CHILD
   #define APR_OC_REASON_DEATH         0     /* child has died, caller must call
                                              * unregister still */
   #define APR_OC_REASON_UNWRITABLE    1     /* write_fd is unwritable */
  @@ -84,6 +85,7 @@
                                              * kill the child) */
   #define APR_OC_REASON_LOST          4     /* somehow the child exited without
                                              * us knowing ... buggy os? */
  +#endif /* APR_HAS_OTHER_CHILD */
   
   typedef struct ap_thread_t           ap_thread_t;
   typedef struct ap_threadattr_t       ap_threadattr_t;
  @@ -91,7 +93,9 @@
   typedef struct ap_procattr_t         ap_procattr_t;
   
   typedef struct ap_threadkey_t        ap_threadkey_t;
  +#if APR_HAS_OTHER_CHILD
   typedef struct ap_other_child_rec_t  ap_other_child_rec_t;
  +#endif /* APR_HAS_OTHER_CHILD */
   
   typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *);
   
  @@ -583,6 +587,7 @@
    */
   ap_status_t ap_detach(ap_proc_t **new, ap_pool_t *cont);
   
  +#if APR_HAS_OTHER_CHILD
   /*
   
   =head1 void ap_register_other_child(ap_proc_t *pid, void (*maintenance) (int reason, void
*data, int status), void *data, int write_fd, ap_pool_t *p)
  @@ -645,6 +650,7 @@
   =cut
    */
   void ap_check_other_child(void); 
  +#endif /* APR_HAS_OTHER_CHILD */
   
   /*
   
  
  
  

Mime
View raw message