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/threadproc/unix thread.c threadpriv.c
Date Thu, 22 Jun 2000 16:05:42 GMT
rbb         00/06/22 09:05:41

  Modified:    src/lib/apr/file_io/win32 dir.c fileio.h
               src/lib/apr/lib apr_pools.c apr_signal.c
               src/lib/apr/misc/unix misc.h
               src/lib/apr/mmap/unix common.c mmap.c
               src/lib/apr/threadproc/unix thread.c threadpriv.c
  Log:
  Cleanup yesterday's patch to make APR use APR namespace protected macros.
  This makes APR use #if instead of #ifdef when using an APR macro.  Since
  APR has stated that it will be using #if always, this is at least a step
  in that direction.  This also fixes a problem with building MMAP that I
  think I introduced yesterday.
  Submitted by:	Bill Stoddard
  
  Revision  Changes    Path
  1.23      +2 -2      apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- dir.c	2000/06/22 00:35:55	1.22
  +++ dir.c	2000/06/22 16:05:28	1.23
  @@ -59,13 +59,13 @@
   #include "apr_portable.h"
   #include "atime.h"
   
  -#ifdef APR_HAVE_ERRNO_H
  +#if APR_HAVE_ERRNO_H
   #include <errno.h>
   #endif
   #ifdef HAVE_STRING_H
   #include <string.h>
   #endif
  -#ifdef APR_HAVE_DIRENT_H
  +#if APR_HAVE_DIRENT_H
   #include <dirent.h>
   #endif
   #ifdef HAVE_SYS_STAT_H
  
  
  
  1.26      +2 -2      apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- fileio.h	2000/06/22 00:35:55	1.25
  +++ fileio.h	2000/06/22 16:05:29	1.26
  @@ -63,7 +63,7 @@
   #include "apr_file_io.h"
   #include "apr_errno.h"
   
  -#ifdef APR_HAVE_SYS_STAT_H
  +#if APR_HAVE_SYS_STAT_H
   #include <sys/stat.h>
   #endif
   #ifdef HAVE_SYS_TYPES_H
  @@ -75,7 +75,7 @@
   #ifdef HAVE_TIME_H
   #include <time.h>
   #endif
  -#ifdef APR_HAVE_DIRENT_H
  +#if APR_HAVE_DIRENT_H
   #include <dirent.h>
   #endif
   #ifdef HAVE_MALLOC_H
  
  
  
  1.60      +4 -4      apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- apr_pools.c	2000/06/22 00:35:57	1.59
  +++ apr_pools.c	2000/06/22 16:05:31	1.60
  @@ -75,19 +75,19 @@
   #ifdef HAVE_SYS_SIGNAL_H
   #include <sys/signal.h>
   #endif
  -#ifdef APR_HAVE_SIGNAL_H
  +#if APR_HAVE_SIGNAL_H
   #include <signal.h>
   #endif
  -#ifdef APR_HAVE_SYS_WAIT_H
  +#if APR_HAVE_SYS_WAIT_H
   #include <sys/wait.h>
   #endif
  -#ifdef APR_HAVE_SYS_TYPES_H
  +#if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
   #endif
   #ifdef HAVE_UNISTD_H
   #include <unistd.h>
   #endif
  -#ifdef APR_HAVE_FCNTL_H
  +#if APR_HAVE_FCNTL_H
   #include <fcntl.h>
   #endif
   
  
  
  
  1.10      +1 -1      apache-2.0/src/lib/apr/lib/apr_signal.c
  
  Index: apr_signal.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_signal.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_signal.c	2000/06/22 00:35:57	1.9
  +++ apr_signal.c	2000/06/22 16:05:32	1.10
  @@ -54,7 +54,7 @@
   
   #include "apr_private.h"
   #include "apr_lib.h"
  -#ifdef APR_HAVE_SIGNAL_H
  +#if APR_HAVE_SIGNAL_H
   #include <signal.h>
   #endif
   
  
  
  
  1.19      +3 -3      apache-2.0/src/lib/apr/misc/unix/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- misc.h	2000/06/22 00:36:02	1.18
  +++ misc.h	2000/06/22 16:05:33	1.19
  @@ -67,16 +67,16 @@
   #ifdef HAVE_STDLIB_H
   #include <stdlib.h>
   #endif
  -#ifdef APR_HAVE_STDIO_H
  +#if APR_HAVE_STDIO_H
   #include <stdio.h>
   #endif
   #ifdef HAVE_STRING_H
   #include <string.h>
   #endif
  -#ifdef APR_HAVE_SIGNAL_H
  +#if APR_HAVE_SIGNAL_H
   #include <signal.h>
   #endif
  -#ifdef APR_HAVE_PTHREAD_H
  +#if APR_HAVE_PTHREAD_H
   #include <pthread.h>
   #endif
   #ifdef BEOS
  
  
  
  1.15      +1 -1      apache-2.0/src/lib/apr/mmap/unix/common.c
  
  Index: common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/common.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- common.c	2000/06/22 00:36:03	1.14
  +++ common.c	2000/06/22 16:05:36	1.15
  @@ -63,7 +63,7 @@
   
   #include "mmap_h.h"
   
  -#if APR_HAVE_MMAP || defined(BEOS)
  +#if APR_HAS_MMAP || defined(BEOS)
   
   ap_status_t ap_mmap_offset(void **addr, ap_mmap_t *mmap, ap_off_t offset)
   {  
  
  
  
  1.24      +1 -1      apache-2.0/src/lib/apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mmap.c	2000/06/22 00:36:04	1.23
  +++ mmap.c	2000/06/22 16:05:37	1.24
  @@ -55,7 +55,7 @@
   #include "mmap_h.h"
   #include "apr_portable.h"
   
  -#if APR_HAVE_MMAP || defined(BEOS)
  +#if APR_HAS_MMAP || defined(BEOS)
   
   static ap_status_t mmap_cleanup(void *themmap)
   {
  
  
  
  1.24      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- thread.c	2000/06/22 00:36:07	1.23
  +++ thread.c	2000/06/22 16:05:39	1.24
  @@ -58,7 +58,7 @@
   
   #if APR_HAS_THREADS
   
  -#ifdef APR_HAVE_PTHREAD_H
  +#if APR_HAVE_PTHREAD_H
   ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_pool_t *cont)
   {
       ap_status_t stat;
  
  
  
  1.21      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- threadpriv.c	2000/06/22 00:36:07	1.20
  +++ threadpriv.c	2000/06/22 16:05:39	1.21
  @@ -58,7 +58,7 @@
   
   #if APR_HAS_THREADS
   
  -#ifdef APR_HAVE_PTHREAD_H
  +#if APR_HAVE_PTHREAD_H
   ap_status_t ap_create_thread_private(ap_threadkey_t **key, 
                                        void (*dest)(void *), ap_pool_t *cont)
   {
  
  
  

Mime
View raw message