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/time/win32 atime.h
Date Sat, 22 Apr 2000 06:16:51 GMT
rbb         00/04/21 23:16:50

  Modified:    src/lib/apr APRDesign Makefile.in acconfig.h aprlib.dsp
                        configure.in
               src/lib/apr/dso/aix Makefile.in dso.h
               src/lib/apr/dso/beos Makefile.in dso.h
               src/lib/apr/dso/os2 Makefile.in dso.h
               src/lib/apr/dso/unix Makefile.in dso.h
               src/lib/apr/dso/win32 dso.h
               src/lib/apr/file_io/beos Makefile.in
               src/lib/apr/file_io/os2 Makefile.in fileio.h
               src/lib/apr/file_io/unix Makefile.in fileio.h
               src/lib/apr/file_io/win32 fileio.h filestat.c open.c
               src/lib/apr/i18n/unix Makefile.in xlate.c
               src/lib/apr/include .cvsignore
               src/lib/apr/lib Makefile.in apr_cpystrn.c apr_execve.c
                        apr_fnmatch.c apr_getpass.c apr_md5.c apr_pools.c
                        apr_signal.c apr_snprintf.c apr_tables.c
               src/lib/apr/locks/beos Makefile.in
               src/lib/apr/locks/os2 Makefile.in
               src/lib/apr/locks/unix Makefile.in locks.h
               src/lib/apr/misc/beos Makefile.in misc.h
               src/lib/apr/misc/unix Makefile.in misc.h
               src/lib/apr/misc/win32 names.c rand.c start.c
               src/lib/apr/mmap/beos Makefile.in
               src/lib/apr/mmap/unix Makefile.in mmap_h.h
               src/lib/apr/network_io/beos Makefile.in
               src/lib/apr/network_io/os2 Makefile.in
               src/lib/apr/network_io/unix Makefile.in networkio.h
               src/lib/apr/test Makefile.in
               src/lib/apr/threadproc/beos Makefile.in
               src/lib/apr/threadproc/os2 Makefile.in proc.c
               src/lib/apr/threadproc/unix Makefile.in threadproc.h
               src/lib/apr/threadproc/win32 thread.c threadproc.h
               src/lib/apr/time/unix Makefile.in atime.h
               src/lib/apr/time/win32 atime.h
  Log:
  Move apr_config.h and apr_config.hw to apr_private.h and apr_private.hw.
  This should make the fact that this is a private header file more obvious.
  This also updates all of the references to apr_config.h
  
  Revision  Changes    Path
  1.12      +3 -3      apache-2.0/src/lib/apr/APRDesign
  
  Index: APRDesign
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/APRDesign,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- APRDesign	2000/04/19 17:30:39	1.11
  +++ APRDesign	2000/04/22 06:16:11	1.12
  @@ -22,10 +22,10 @@
   APR On Windows
   
   APR on Windows is different from APR on all other systems, because it
  -doesn't use autoconf. On Unix, apr_config.h (private to APR) and apr.h 
  +doesn't use autoconf. On Unix, apr_private.h (private to APR) and apr.h 
   (public, used by applications that use APR) are generated by autoconf 
  -from acconfig.h and apr.h.in respectively. On Windows, apr_config.h 
  -and apr.h are created from apr_config.hw and apr.hw respectively.
  +from acconfig.h and apr.h.in respectively. On Windows, apr_private.h 
  +and apr.h are created from apr_private.hw and apr.hw respectively.
   
   !!!***  If you add code to acconfig.h or tests to configure.in or aclocal.m4,
           please give some thought to whether or not Windows needs this addition
  
  
  
  1.20      +1 -1      apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Makefile.in	2000/03/14 08:04:50	1.19
  +++ Makefile.in	2000/04/22 06:16:11	1.20
  @@ -56,7 +56,7 @@
   depend: subdirs_depend
   
   distclean: subdirs_distclean
  -	-$(RM) -f include/apr.h include/apr_config.h
  +	-$(RM) -f include/apr.h include/apr_private.h
   	-$(RM) -f *.o *.a *.so
   	-$(RM) -f config.cache config.status config.log
   	-$(RM) -f Makefile
  
  
  
  1.25      +3 -3      apache-2.0/src/lib/apr/acconfig.h
  
  Index: acconfig.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- acconfig.h	2000/04/15 19:05:11	1.24
  +++ acconfig.h	2000/04/22 06:16:11	1.25
  @@ -1,5 +1,5 @@
  -#ifndef APR_CONFIG_H
  -#define APR_CONFIG_H
  +#ifndef APR_PRIVATE_H
  +#define APR_PRIVATE_H
   
   /* So that we can use inline on some critical functions, and use
    * GNUC attributes (such as to get -Wall warnings for printf-like
  @@ -68,4 +68,4 @@
   typedef int socklen_t;
   #endif
   
  -#endif /* APR_CONFIG_H */
  +#endif /* APR_PRIVATE_H */
  
  
  
  1.21      +10 -10    apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- aprlib.dsp	2000/04/21 22:12:40	1.20
  +++ aprlib.dsp	2000/04/22 06:16:12	1.21
  @@ -326,7 +326,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\include\apr_config.h
  +SOURCE=.\include\apr_private.h
   # End Source File
   # End Group
   # Begin Group "Internal Header Files"
  @@ -334,27 +334,27 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=.\include\apr_config.hw
  +SOURCE=.\include\apr_private.hw
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   # Begin Custom Build
  -InputPath=.\include\apr_config.hw
  +InputPath=.\include\apr_private.hw
   
  -".\include\apr_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\apr_config.hw .\include\apr_config.h > nul 
  -	echo Created apr_config.h from apr_config.hw 
  +".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apr_private.hw .\include\apr_private.h > nul 
  +	echo Created apr_private.h from apr_private.hw 
   	
   # End Custom Build
   
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
   # Begin Custom Build
  -InputPath=.\include\apr_config.hw
  +InputPath=.\include\apr_private.hw
   
  -".\include\apr_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\apr_config.hw .\include\apr_config.h > nul 
  -	echo Created apr_config.h from apr_config.hw 
  +".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\apr_private.hw .\include\apr_private.h > nul 
  +	echo Created apr_private.h from apr_private.hw 
   	
   # End Custom Build
   
  
  
  
  1.73      +1 -1      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.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- configure.in	2000/04/20 02:03:11	1.72
  +++ configure.in	2000/04/22 06:16:12	1.73
  @@ -19,7 +19,7 @@
   
   dnl Process this file with autoconf to produce a configure script.
   AC_INIT(configure.in)
  -AC_CONFIG_HEADER(include/apr_config.h)
  +AC_CONFIG_HEADER(include/apr_private.h)
   
   # Most platforms use a prefix of 'lib' on their library files.
   LIBPREFIX='lib'
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/dso/aix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/04/02 15:00:22	1.1
  +++ Makefile.in	2000/04/22 06:16:13	1.2
  @@ -49,12 +49,12 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -getopt.o: getopt.c misc.h ../../include/apr_config.h \
  +getopt.o: getopt.c misc.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
    ../../include/apr_getopt.h
  -start.o: start.c misc.h ../../include/apr_config.h \
  +start.o: start.c misc.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/dso/aix/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dso.h	2000/04/14 15:58:19	1.3
  +++ dso.h	2000/04/22 06:16:13	1.4
  @@ -55,7 +55,7 @@
   #ifndef DSO_H
   #define DSO_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_pools.h"
   #include "apr_dso.h"
  
  
  
  1.3       +2 -2      apache-2.0/src/lib/apr/dso/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in	2000/03/31 13:07:42	1.2
  +++ Makefile.in	2000/04/22 06:16:14	1.3
  @@ -48,12 +48,12 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -getopt.o: getopt.c misc.h ../../include/apr_config.h \
  +getopt.o: getopt.c misc.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
    ../../include/apr_getopt.h
  -start.o: start.c misc.h ../../include/apr_config.h \
  +start.o: start.c misc.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/dso/beos/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/dso.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dso.h	2000/04/14 15:58:19	1.5
  +++ dso.h	2000/04/22 06:16:15	1.6
  @@ -55,7 +55,7 @@
   #ifndef DSO_H
   #define DSO_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_pools.h"
   #include "apr_errno.h"
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/dso/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in	2000/03/31 13:07:43	1.3
  +++ Makefile.in	2000/04/22 06:16:15	1.4
  @@ -49,7 +49,7 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -dso.o: dso.c dso.h $(INCDIR)/apr_config.h \
  +dso.o: dso.c dso.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/dso/os2/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- dso.h	2000/04/14 15:58:20	1.7
  +++ dso.h	2000/04/22 06:16:16	1.8
  @@ -58,7 +58,7 @@
   #define INCL_DOS
   #include <os2.h>
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_pools.h"
   #include "apr_dso.h"
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/dso/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	2000/04/04 03:55:26	1.4
  +++ Makefile.in	2000/04/22 06:16:16	1.5
  @@ -49,7 +49,7 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -dso.o: dso.c dso.h $(INCDIR)/apr_config.h \
  +dso.o: dso.c dso.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/dso/unix/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dso.h	2000/04/14 15:58:20	1.6
  +++ dso.h	2000/04/22 06:16:16	1.7
  @@ -55,7 +55,7 @@
   #ifndef DSO_H
   #define DSO_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_pools.h"
   #include "apr_dso.h"
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/dso/win32/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/win32/dso.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dso.h	2000/04/14 15:58:21	1.2
  +++ dso.h	2000/04/22 06:16:17	1.3
  @@ -55,7 +55,7 @@
   #ifndef DSO_H
   #define DSO_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_pools.h"
   #include "apr_dso.h"
  
  
  
  1.9       +2 -2      apache-2.0/src/lib/apr/file_io/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	1999/12/19 18:10:00	1.8
  +++ Makefile.in	2000/04/22 06:16:18	1.9
  @@ -50,14 +50,14 @@
   
   # DO NOT REMOVE
   file_io_common.o: file_io_common.c ../unix/dir.c ../unix/fileio.h \
  - ../../include/apr_config.h ../../include/apr_general.h \
  + ../../include/apr_private.h ../../include/apr_general.h \
    ../../include/apr.h ../../include/apr_errno.h \
    ../../include/apr_file_io.h ../../include/apr_lib.h \
    ../../include/apr_portable.h ../../include/apr_thread_proc.h \
    ../../include/apr_network_io.h ../../include/apr_lock.h \
    ../../include/apr_time.h ../unix/fileacc.c ../unix/filedup.c \
    ../unix/filestat.c ../unix/open.c ../unix/pipe.c ../unix/seek.c
  -readwrite.o: readwrite.c ../unix/fileio.h ../../include/apr_config.h \
  +readwrite.o: readwrite.c ../unix/fileio.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_file_io.h \
    ../../include/apr_lib.h
  
  
  
  1.9       +9 -9      apache-2.0/src/lib/apr/file_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	2000/04/19 16:26:33	1.8
  +++ Makefile.in	2000/04/22 06:16:19	1.9
  @@ -58,47 +58,47 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -dir.o: dir.c fileio.h $(INCDIR1)/apr_config.h \
  +dir.o: dir.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h
  -fileacc.o: fileacc.c fileio.h $(INCDIR1)/apr_config.h \
  +fileacc.o: fileacc.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h
  -filedup.o: filedup.c fileio.h $(INCDIR1)/apr_config.h \
  +filedup.o: filedup.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h
  -filestat.o: filestat.c fileio.h $(INCDIR1)/apr_config.h \
  +filestat.o: filestat.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h
  -maperrorcode.o: maperrorcode.c fileio.h $(INCDIR1)/apr_config.h \
  +maperrorcode.o: maperrorcode.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h ../../network_io/os2/os2calls.h
  -open.o: open.c fileio.h $(INCDIR1)/apr_config.h \
  +open.o: open.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h $(INCDIR1)/apr_portable.h \
    $(INCDIR1)/apr_network_io.h $(INCDIR1)/apr_lock.h
  -pipe.o: pipe.c fileio.h $(INCDIR1)/apr_config.h \
  +pipe.o: pipe.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h
  -readwrite.o: readwrite.c fileio.h $(INCDIR1)/apr_config.h \
  +readwrite.o: readwrite.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h
  -seek.o: seek.c fileio.h $(INCDIR1)/apr_config.h \
  +seek.o: seek.c fileio.h $(INCDIR1)/apr_private.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  
  
  
  1.18      +1 -1      apache-2.0/src/lib/apr/file_io/os2/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- fileio.h	2000/04/18 15:01:04	1.17
  +++ fileio.h	2000/04/22 06:16:19	1.18
  @@ -58,7 +58,7 @@
   #define INCL_DOS
   #include <os2.h>
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_lock.h"
   #include "apr_file_io.h"
  
  
  
  1.9       +11 -10    apache-2.0/src/lib/apr/file_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	2000/03/18 12:32:16	1.8
  +++ Makefile.in	2000/04/22 06:16:20	1.9
  @@ -56,44 +56,45 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -dir.o: dir.c fileio.h $(INCDIR)/apr_config.h \
  +dir.o: dir.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_portable.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h
  -fileacc.o: fileacc.c fileio.h $(INCDIR)/apr_config.h \
  +fileacc.o: fileacc.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_thread_proc.h
  -filedup.o: filedup.c fileio.h $(INCDIR)/apr_config.h \
  +filedup.o: filedup.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_thread_proc.h
  -filestat.o: filestat.c fileio.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_portable.h \
  + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h
  +filestat.o: filestat.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_thread_proc.h
  -open.o: open.c fileio.h $(INCDIR)/apr_config.h \
  +open.o: open.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_portable.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h
  -pipe.o: pipe.c fileio.h $(INCDIR)/apr_config.h \
  +pipe.o: pipe.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_thread_proc.h
  -readwrite.o: readwrite.c fileio.h $(INCDIR)/apr_config.h \
  +readwrite.o: readwrite.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_thread_proc.h
  -seek.o: seek.c fileio.h $(INCDIR)/apr_config.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_lock.h
  +seek.o: seek.c fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  
  
  
  1.19      +1 -1      apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- fileio.h	2000/04/15 02:56:48	1.18
  +++ fileio.h	2000/04/22 06:16:20	1.19
  @@ -55,7 +55,7 @@
   #ifndef FILE_IO_H
   #define FILE_IO_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_file_io.h"
   #include "apr_errno.h"
  
  
  
  1.18      +1 -1      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- fileio.h	2000/04/15 02:56:49	1.17
  +++ fileio.h	2000/04/22 06:16:21	1.18
  @@ -76,7 +76,7 @@
   #ifdef HAVE_UIO_H
   #include <sys/uio.h>
   #endif
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_pools.h"
   #include "apr_general.h"
   #include "apr_file_io.h"
  
  
  
  1.17      +1 -1      apache-2.0/src/lib/apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- filestat.c	2000/04/20 17:21:31	1.16
  +++ filestat.c	2000/04/22 06:16:21	1.17
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.35      +1 -1      apache-2.0/src/lib/apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/open.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- open.c	2000/04/20 17:21:31	1.34
  +++ open.c	2000/04/22 06:16:22	1.35
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/i18n/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/i18n/unix/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/04/20 02:03:10	1.1
  +++ Makefile.in	2000/04/22 06:16:23	1.2
  @@ -38,7 +38,7 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -xlate.o: xlate.c $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
  +xlate.o: xlate.c $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_thread_proc.h \
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/i18n/unix/xlate.c
  
  Index: xlate.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/i18n/unix/xlate.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- xlate.c	2000/04/20 02:03:10	1.1
  +++ xlate.c	2000/04/22 06:16:23	1.2
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   
   #include "apr_lib.h"
   #include "apr_xlate.h"
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/include/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .cvsignore	1999/12/24 18:35:09	1.3
  +++ .cvsignore	2000/04/22 06:16:24	1.4
  @@ -1,3 +1,3 @@
   apr.h
  -apr_config.h
  -apr_config.h.in
  +apr_private.h
  +apr_private.h.in
  
  
  
  1.12      +11 -11    apache-2.0/src/lib/apr/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.in	2000/04/06 22:23:50	1.11
  +++ Makefile.in	2000/04/22 06:16:25	1.12
  @@ -59,38 +59,38 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -apr_cpystrn.o: apr_cpystrn.c $(INCDIR)/apr_config.h \
  +apr_cpystrn.o: apr_cpystrn.c $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_thread_proc.h
  -apr_execve.o: apr_execve.c $(INCDIR)/apr_config.h
  -apr_fnmatch.o: apr_fnmatch.c $(INCDIR)/apr_config.h \
  - $(INCDIR)/apr_fnmatch.h $(INCDIR)/apr_errno.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h \
  +apr_execve.o: apr_execve.c $(INCDIR)/apr_private.h
  +apr_fnmatch.o: apr_fnmatch.c $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_fnmatch.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_thread_proc.h
  -apr_getpass.o: apr_getpass.c $(INCDIR)/apr_config.h \
  +apr_getpass.o: apr_getpass.c $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_thread_proc.h
  -apr_md5.o: apr_md5.c $(INCDIR)/apr_config.h $(INCDIR)/apr_md5.h \
  +apr_md5.o: apr_md5.c $(INCDIR)/apr_private.h $(INCDIR)/apr_md5.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_thread_proc.h
  -apr_pools.o: apr_pools.c $(INCDIR)/apr_config.h \
  +apr_pools.o: apr_pools.c $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_pools.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_lock.h ../misc/unix/misc.h $(INCDIR)/apr_getopt.h
  -apr_signal.o: apr_signal.c $(INCDIR)/apr_config.h \
  +apr_signal.o: apr_signal.c $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_thread_proc.h
  -apr_snprintf.o: apr_snprintf.c $(INCDIR)/apr_config.h \
  +apr_snprintf.o: apr_snprintf.c $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_thread_proc.h
  -apr_tables.o: apr_tables.c $(INCDIR)/apr_config.h \
  +apr_tables.o: apr_tables.c $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_pools.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_thread_proc.h \
  
  
  
  1.16      +1 -1      apache-2.0/src/lib/apr/lib/apr_cpystrn.c
  
  Index: apr_cpystrn.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_cpystrn.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- apr_cpystrn.c	2000/04/16 00:11:01	1.15
  +++ apr_cpystrn.c	2000/04/22 06:16:25	1.16
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_lib.h"
   
   #if HAVE_SYS_TYPES_H
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/lib/apr_execve.c
  
  Index: apr_execve.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_execve.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr_execve.c	2000/03/31 08:35:59	1.8
  +++ apr_execve.c	2000/04/22 06:16:26	1.9
  @@ -87,7 +87,7 @@
    * SUCH DAMAGE.
    */
   #ifndef WIN32
  -#include "apr_config.h"
  +#include "apr_private.h"
   #endif
   /*---------------------------------------------------------------*/
   
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/lib/apr_fnmatch.c
  
  Index: apr_fnmatch.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_fnmatch.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_fnmatch.c	1999/11/22 18:01:23	1.4
  +++ apr_fnmatch.c	2000/04/22 06:16:26	1.5
  @@ -43,7 +43,7 @@
    * Compares a filename or pathname to a pattern.
    */
   #ifndef WIN32
  -#include "apr_config.h"
  +#include "apr_private.h"
   #endif
   #include "apr_fnmatch.h"
   #include "apr_lib.h"
  
  
  
  1.13      +1 -1      apache-2.0/src/lib/apr/lib/apr_getpass.c
  
  Index: apr_getpass.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_getpass.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_getpass.c	2000/04/03 18:40:40	1.12
  +++ apr_getpass.c	2000/04/22 06:16:26	1.13
  @@ -57,7 +57,7 @@
    * wrapper for the system library's getpass() routine; otherwise, we
    * use one we define ourselves.
    */
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_lib.h"
   #include "apr_errno.h"
   #include <sys/types.h>
  
  
  
  1.10      +1 -1      apache-2.0/src/lib/apr/lib/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_md5.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apr_md5.c	2000/03/31 08:35:59	1.9
  +++ apr_md5.c	2000/04/22 06:16:26	1.10
  @@ -96,7 +96,7 @@
    * ----------------------------------------------------------------------------
    */
   #ifndef WIN32
  -#include "apr_config.h"
  +#include "apr_private.h"
   #endif
   #include "apr_md5.h"
   #include "apr_lib.h"
  
  
  
  1.46      +1 -1      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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- apr_pools.c	2000/04/21 20:11:59	1.45
  +++ apr_pools.c	2000/04/22 06:16:26	1.46
  @@ -59,7 +59,7 @@
    * rst --- 4/95 --- 6/95
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   
   #include "apr_general.h"
   #include "apr_pools.h"
  
  
  
  1.8       +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_signal.c	2000/03/31 08:36:00	1.7
  +++ apr_signal.c	2000/04/22 06:16:26	1.8
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_lib.h"
   #ifdef HAVE_SIGNAL_H
   #include <signal.h>
  
  
  
  1.15      +1 -1      apache-2.0/src/lib/apr/lib/apr_snprintf.c
  
  Index: apr_snprintf.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_snprintf.c	2000/04/06 01:38:07	1.14
  +++ apr_snprintf.c	2000/04/22 06:16:26	1.15
  @@ -55,7 +55,7 @@
   #ifdef WIN32
   #include <winsock2.h>
   #endif
  -#include "apr_config.h"
  +#include "apr_private.h"
   
   #include "apr_lib.h"
   #include <math.h>
  
  
  
  1.15      +1 -1      apache-2.0/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_tables.c	2000/04/14 15:58:28	1.14
  +++ apr_tables.c	2000/04/22 06:16:26	1.15
  @@ -59,7 +59,7 @@
    * rst --- 4/95 --- 6/95
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   
   #include "apr_general.h"
   #include "apr_pools.h"
  
  
  
  1.5       +3 -3      apache-2.0/src/lib/apr/locks/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	1999/12/20 16:04:15	1.4
  +++ Makefile.in	2000/04/22 06:16:30	1.5
  @@ -52,13 +52,13 @@
   
   # DO NOT REMOVE
   crossproc.o: crossproc.c ../../include/apr_lock.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr_private.h \
    ../../include/apr_errno.h ../../include/apr_lib.h \
    ../../include/apr_file_io.h locks.h
   intraproc.o: intraproc.c ../../include/apr_lock.h \
  - ../../include/apr_general.h ../../include/apr_config.h \
  + ../../include/apr_general.h ../../include/apr_private.h \
    ../../include/apr_errno.h locks.h ../../include/apr_file_io.h \
    ../../include/apr_lib.h
   locks.o: locks.c ../../include/apr_lock.h ../../include/apr_general.h \
  - ../../include/apr_config.h ../../include/apr_errno.h locks.h \
  + ../../include/apr_private.h ../../include/apr_errno.h locks.h \
    ../../include/apr_file_io.h
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/locks/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	2000/03/16 10:04:54	1.5
  +++ Makefile.in	2000/04/22 06:16:32	1.6
  @@ -56,4 +56,4 @@
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_time.h \
    $(INCDIR1)/apr_thread_proc.h locks.h $(INCDIR1)/apr_lock.h \
  - $(INCDIR2)/fileio.h $(INCDIR1)/apr_config.h
  + $(INCDIR2)/fileio.h $(INCDIR1)/apr_private.h
  
  
  
  1.9       +3 -3      apache-2.0/src/lib/apr/locks/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	2000/03/18 12:32:18	1.8
  +++ Makefile.in	2000/04/22 06:16:32	1.9
  @@ -52,17 +52,17 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -crossproc.o: crossproc.c locks.h ../../include/apr_config.h \
  +crossproc.o: crossproc.c locks.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_lib.h \
    ../../include/apr_file_io.h ../../include/apr_time.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h
  -intraproc.o: intraproc.c locks.h ../../include/apr_config.h \
  +intraproc.o: intraproc.c locks.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_lib.h \
    ../../include/apr_file_io.h ../../include/apr_time.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h
  -locks.o: locks.c locks.h ../../include/apr_config.h \
  +locks.o: locks.c locks.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_lib.h \
    ../../include/apr_file_io.h ../../include/apr_time.h \
  
  
  
  1.20      +1 -1      apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- locks.h	2000/04/14 15:58:30	1.19
  +++ locks.h	2000/04/22 06:16:33	1.20
  @@ -55,7 +55,7 @@
   #ifndef LOCKS_H
   #define LOCKS_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_lib.h"
   #include "apr_lock.h"
  
  
  
  1.10      +2 -2      apache-2.0/src/lib/apr/misc/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/Makefile.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.in	2000/04/05 11:24:17	1.9
  +++ Makefile.in	2000/04/22 06:16:34	1.10
  @@ -49,12 +49,12 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -getopt.o: getopt.c misc.h ../../include/apr_config.h \
  +getopt.o: getopt.c misc.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
    ../../include/apr_getopt.h
  -start.o: start.c misc.h ../../include/apr_config.h \
  +start.o: start.c misc.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
  
  
  
  1.13      +1 -1      apache-2.0/src/lib/apr/misc/beos/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- misc.h	2000/04/14 15:58:31	1.12
  +++ misc.h	2000/04/22 06:16:34	1.13
  @@ -55,7 +55,7 @@
   #ifndef MISC_H
   #define MISC_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_pools.h"
   #include "apr_getopt.h"
  
  
  
  1.16      +25 -6     apache-2.0/src/lib/apr/misc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.in	2000/04/20 16:19:03	1.15
  +++ Makefile.in	2000/04/22 06:16:36	1.16
  @@ -52,21 +52,40 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  +canonerr.o: canonerr.c misc.h ../../include/apr.h \
  + ../../include/apr_private.h ../../include/apr_general.h \
  + ../../include/apr_errno.h ../../include/apr_pools.h \
  + ../../include/apr_lib.h ../../include/apr_file_io.h \
  + ../../include/apr_time.h ../../include/apr_thread_proc.h \
  + ../../include/apr_getopt.h
  +errorcodes.o: errorcodes.c misc.h ../../include/apr.h \
  + ../../include/apr_private.h ../../include/apr_general.h \
  + ../../include/apr_errno.h ../../include/apr_pools.h \
  + ../../include/apr_lib.h ../../include/apr_file_io.h \
  + ../../include/apr_time.h ../../include/apr_thread_proc.h \
  + ../../include/apr_getopt.h
   getopt.o: getopt.c misc.h ../../include/apr.h \
  - ../../include/apr_config.h ../../include/apr_general.h \
  + ../../include/apr_private.h ../../include/apr_general.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_thread_proc.h \
    ../../include/apr_getopt.h
   otherchild.o: otherchild.c misc.h ../../include/apr.h \
  - ../../include/apr_config.h ../../include/apr_general.h \
  + ../../include/apr_private.h ../../include/apr_general.h \
    ../../include/apr_errno.h ../../include/apr_pools.h \
    ../../include/apr_lib.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_thread_proc.h \
  - ../../include/apr_getopt.h
  -start.o: start.c misc.h ../../include/apr.h ../../include/apr_config.h \
  + ../../include/apr_getopt.h ../../threadproc/unix/threadproc.h \
  + ../../file_io/unix/fileio.h
  +rand.o: rand.c misc.h ../../include/apr.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr_errno.h \
    ../../include/apr_pools.h ../../include/apr_lib.h \
    ../../include/apr_file_io.h ../../include/apr_time.h \
  - ../../include/apr_thread_proc.h ../../include/apr_getopt.h \
  - ../../locks/unix/locks.h ../../include/apr_lock.h
  + ../../include/apr_thread_proc.h ../../include/apr_getopt.h
  +start.o: start.c misc.h ../../include/apr.h \
  + ../../include/apr_private.h ../../include/apr_general.h \
  + ../../include/apr_errno.h ../../include/apr_pools.h \
  + ../../include/apr_lib.h ../../include/apr_file_io.h \
  + ../../include/apr_time.h ../../include/apr_thread_proc.h \
  + ../../include/apr_getopt.h ../../locks/unix/locks.h \
  + ../../include/apr_lock.h
  
  
  
  1.14      +1 -1      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- misc.h	2000/04/14 15:58:32	1.13
  +++ misc.h	2000/04/22 06:16:36	1.14
  @@ -56,7 +56,7 @@
   #define MISC_H
   
   #include "apr.h"
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_pools.h"
   #include "apr_getopt.h"
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/misc/win32/names.c
  
  Index: names.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- names.c	2000/04/14 15:58:34	1.8
  +++ names.c	2000/04/22 06:16:37	1.9
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.3       +1 -1      apache-2.0/src/lib/apr/misc/win32/rand.c
  
  Index: rand.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/rand.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- rand.c	2000/04/21 22:12:40	1.2
  +++ rand.c	2000/04/22 06:16:37	1.3
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include <wincrypt.h>
   
  
  
  
  1.26      +1 -1      apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- start.c	2000/04/19 21:17:35	1.25
  +++ start.c	2000/04/22 06:16:37	1.26
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "misc.h"
   #include "apr_general.h"
   #include "apr_errno.h"
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/mmap/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	1999/12/19 18:10:02	1.5
  +++ Makefile.in	2000/04/22 06:16:39	1.6
  @@ -55,7 +55,7 @@
    ../../include/apr_file_io.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../include/apr_time.h ../../include/apr_lib.h \
  - ../../file_io/unix/fileio.h ../../include/apr_config.h
  + ../../file_io/unix/fileio.h ../../include/apr_private.h
   mmap_common.o: mmap_common.c ../unix/common.c ../unix/../beos/mmap_h.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_mmap.h \
  
  
  
  1.9       +2 -2      apache-2.0/src/lib/apr/mmap/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	2000/03/18 12:32:19	1.8
  +++ Makefile.in	2000/04/22 06:16:40	1.9
  @@ -50,14 +50,14 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -common.o: common.c mmap_h.h ../../include/apr_config.h \
  +common.o: common.c mmap_h.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_mmap.h \
    ../../include/apr_network_io.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../file_io/unix/fileio.h ../../include/apr_lib.h
  -mmap.o: mmap.c mmap_h.h ../../include/apr_config.h \
  +mmap.o: mmap.c mmap_h.h ../../include/apr_private.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_mmap.h \
    ../../include/apr_network_io.h ../../include/apr_file_io.h \
  
  
  
  1.11      +1 -1      apache-2.0/src/lib/apr/mmap/unix/mmap_h.h
  
  Index: mmap_h.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap_h.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mmap_h.h	2000/04/14 15:58:35	1.10
  +++ mmap_h.h	2000/04/22 06:16:40	1.11
  @@ -55,7 +55,7 @@
   #ifndef MMAP_H_H
   #define MMAP_H_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_general.h"
   #include "apr_mmap.h"
   #include "apr_errno.h"
  
  
  
  1.8       +6 -6      apache-2.0/src/lib/apr/network_io/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	2000/04/03 21:32:11	1.7
  +++ Makefile.in	2000/04/22 06:16:41	1.8
  @@ -59,39 +59,39 @@
    ../../include/apr_time.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_config.h
  + ../../include/apr_private.h
   poll.o: poll.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_config.h
  + ../../include/apr_private.h
   sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_config.h
  + ../../include/apr_private.h
   sockaddr.o: sockaddr.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_config.h
  + ../../include/apr_private.h
   sockets.o: sockets.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_config.h
  + ../../include/apr_private.h
   sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \
    ../../include/apr_general.h ../../include/apr.h \
    ../../include/apr_errno.h ../../include/apr_file_io.h \
    ../../include/apr_time.h ../../include/apr_portable.h \
    ../../include/apr_thread_proc.h ../../include/apr_lock.h \
    ../../include/apr_lib.h ../../file_io/unix/fileio.h \
  - ../../include/apr_config.h
  + ../../include/apr_private.h
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/network_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	2000/03/16 10:04:55	1.7
  +++ Makefile.in	2000/04/22 06:16:42	1.8
  @@ -73,7 +73,7 @@
    $(INCDIR1)/apr_time.h os2calls.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_thread_proc.h
   sockaddr.o: sockaddr.c ../unix/sockaddr.c ../unix/networkio.h \
  - $(INCDIR1)/apr_config.h $(INCDIR1)/apr_network_io.h \
  + $(INCDIR1)/apr_private.h $(INCDIR1)/apr_network_io.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  
  
  
  1.11      +5 -5      apache-2.0/src/lib/apr/network_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2000/03/18 12:32:19	1.10
  +++ Makefile.in	2000/04/22 06:16:42	1.11
  @@ -53,29 +53,29 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -poll.o: poll.c networkio.h $(INCDIR)/apr_config.h \
  +poll.o: poll.c networkio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_thread_proc.h
  -sendrecv.o: sendrecv.c networkio.h $(INCDIR)/apr_config.h \
  +sendrecv.o: sendrecv.c networkio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_thread_proc.h \
    ../../file_io/unix/fileio.h
  -sockaddr.o: sockaddr.c networkio.h $(INCDIR)/apr_config.h \
  +sockaddr.o: sockaddr.c networkio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_thread_proc.h
  -sockets.o: sockets.c networkio.h $(INCDIR)/apr_config.h \
  +sockets.o: sockets.c networkio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_lock.h
  -sockopt.o: sockopt.c networkio.h $(INCDIR)/apr_config.h \
  +sockopt.o: sockopt.c networkio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  
  
  
  1.24      +1 -1      apache-2.0/src/lib/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- networkio.h	2000/04/16 16:59:38	1.23
  +++ networkio.h	2000/04/22 06:16:43	1.24
  @@ -55,7 +55,7 @@
   #ifndef NETWORK_IO_H
   #define NETWORK_IO_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_network_io.h"
   #include "apr_errno.h"
   #include "apr_general.h"
  
  
  
  1.16      +1 -1      apache-2.0/src/lib/apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/Makefile.in,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.in	2000/04/22 05:14:02	1.15
  +++ Makefile.in	2000/04/22 06:16:43	1.16
  @@ -130,7 +130,7 @@
   htdigest.o: htdigest.c $(INCDIR)/apr_lib.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_md5.h $(INCDIR)/apr_config.h
  + $(INCDIR)/apr_md5.h $(INCDIR)/apr_private.h
   mod_test.o: mod_test.c
   server.o: server.c $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  
  
  
  1.10      +5 -5      apache-2.0/src/lib/apr/threadproc/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/Makefile.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.in	2000/04/14 01:54:12	1.9
  +++ Makefile.in	2000/04/22 06:16:44	1.10
  @@ -63,34 +63,34 @@
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_lock.h
   procsup.o: procsup.c threadproc.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_lock.h
   signals.o: signals.c threadproc.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_lock.h
   thread.o: thread.c threadproc.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_config.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_lock.h
   threadpriv.o: threadpriv.c threadproc.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
  - ../../file_io/unix/fileio.h $(INCDIR)/apr_config.h \
  + ../../file_io/unix/fileio.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_portable.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h
  
  
  
  1.7       +4 -4      apache-2.0/src/lib/apr/threadproc/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2000/04/14 01:54:13	1.6
  +++ Makefile.in	2000/04/22 06:16:45	1.7
  @@ -59,22 +59,22 @@
    $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr.h $(INCDIR1)/apr_errno.h \
    $(INCDIR1)/apr_time.h $(INCDIR2)/fileio.h \
  - $(INCDIR1)/apr_config.h $(INCDIR1)/apr_lib.h \
  + $(INCDIR1)/apr_private.h $(INCDIR1)/apr_lib.h \
    $(INCDIR1)/apr_portable.h $(INCDIR1)/apr_network_io.h \
    $(INCDIR1)/apr_lock.h
   signals.o: signals.c threadproc.h $(INCDIR1)/apr_thread_proc.h \
    $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr.h $(INCDIR1)/apr_errno.h \
    $(INCDIR1)/apr_time.h $(INCDIR2)/fileio.h \
  - $(INCDIR1)/apr_config.h
  + $(INCDIR1)/apr_private.h
   thread.o: thread.c threadproc.h $(INCDIR1)/apr_thread_proc.h \
    $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_general.h \
    $(INCDIR1)/apr.h $(INCDIR1)/apr_errno.h \
    $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR2)/fileio.h $(INCDIR1)/apr_config.h
  + $(INCDIR2)/fileio.h $(INCDIR1)/apr_private.h
   threadpriv.o: threadpriv.c threadproc.h \
    $(INCDIR1)/apr_thread_proc.h $(INCDIR1)/apr_file_io.h \
    $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
    $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_time.h \
    $(INCDIR1)/apr_lib.h $(INCDIR2)/fileio.h \
  - $(INCDIR1)/apr_config.h
  + $(INCDIR1)/apr_private.h
  
  
  
  1.21      +1 -1      apache-2.0/src/lib/apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- proc.c	2000/04/20 14:36:54	1.20
  +++ proc.c	2000/04/22 06:16:46	1.21
  @@ -57,7 +57,7 @@
   
   #include "threadproc.h"
   #include "fileio.h"
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.11      +11 -5     apache-2.0/src/lib/apr/threadproc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2000/04/14 01:54:13	1.10
  +++ Makefile.in	2000/04/22 06:16:47	1.11
  @@ -54,31 +54,37 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -proc.o: proc.c threadproc.h $(INCDIR)/apr_config.h \
  +proc.o: proc.c threadproc.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
    ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_lock.h
  -procsup.o: procsup.c threadproc.h $(INCDIR)/apr_config.h \
  +procsup.o: procsup.c threadproc.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
    ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h
  -signals.o: signals.c threadproc.h $(INCDIR)/apr_config.h \
  +signals.o: signals.c threadproc.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
    ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h
  -thread.o: thread.c threadproc.h $(INCDIR)/apr_config.h \
  +thread.o: thread.c threadproc.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
    ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_lock.h
  -threadpriv.o: threadpriv.c threadproc.h $(INCDIR)/apr_config.h \
  +threadcancel.o: threadcancel.c threadproc.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/apr_time.h ../../file_io/unix/fileio.h \
  + $(INCDIR)/apr_lib.h
  +threadpriv.o: threadpriv.c threadproc.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
  
  
  
  1.10      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadproc.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- threadproc.h	2000/04/14 15:58:51	1.9
  +++ threadproc.h	2000/04/22 06:16:47	1.10
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include "fileio.h"
  
  
  
  1.17      +1 -1      apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- thread.c	2000/04/19 21:17:41	1.16
  +++ thread.c	2000/04/22 06:16:48	1.17
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/threadproc/win32/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadproc.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- threadproc.h	2000/04/14 15:58:52	1.8
  +++ threadproc.h	2000/04/22 06:16:49	1.9
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include <windows.h>
  
  
  
  1.12      +2 -2      apache-2.0/src/lib/apr/time/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.in	2000/01/09 20:58:24	1.11
  +++ Makefile.in	2000/04/22 06:16:49	1.12
  @@ -50,13 +50,13 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -time.o: time.c atime.h $(INCDIR)/apr_config.h \
  +time.o: time.c atime.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_lock.h
  -timestr.o: timestr.c atime.h $(INCDIR)/apr_config.h \
  +timestr.o: timestr.c atime.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_thread_proc.h \
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/time/unix/atime.h
  
  Index: atime.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/atime.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- atime.h	2000/04/14 15:58:53	1.7
  +++ atime.h	2000/04/22 06:16:49	1.8
  @@ -55,7 +55,7 @@
   #ifndef ATIME_H
   #define ATIME_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_time.h"
   #include "apr_lib.h"
   
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/time/win32/atime.h
  
  Index: atime.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/atime.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- atime.h	2000/04/14 15:58:54	1.7
  +++ atime.h	2000/04/22 06:16:50	1.8
  @@ -55,7 +55,7 @@
   #ifndef ATIME_H
   #define ATIME_H
   
  -#include "apr_config.h"
  +#include "apr_private.h"
   #include "apr_time.h"
   #include <time.h>
   
  
  
  

Mime
View raw message