diff options
| author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-22 06:16:50 +0000 |
|---|---|---|
| committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-04-22 06:16:50 +0000 |
| commit | 027b764b33be081453d79af7d4c88626d164641d (patch) | |
| tree | a93c6f45aa3188d67e255a5de1b372f748aff66a | |
| parent | f053384d7a6c870a4e98e221ffb115e673d4cf45 (diff) | |
| download | libapr-027b764b33be081453d79af7d4c88626d164641d.tar.gz | |
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
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59924 13f79535-47bb-0310-9956-ffa450edef68
81 files changed, 192 insertions, 166 deletions
@@ -22,10 +22,10 @@ code to the effort. 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 diff --git a/Makefile.in b/Makefile.in index 6c40b6476..3cd2e64aa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -56,7 +56,7 @@ clean: subdirs_clean 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 diff --git a/acconfig.h b/acconfig.h index 2556b5033..5ad3008c6 100644 --- a/acconfig.h +++ b/acconfig.h @@ -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 */ @@ -326,7 +326,7 @@ SOURCE=.\include\apr.h # 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 @@ SOURCE=.\include\apr_config.h # 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 diff --git a/aprlib.dsp b/aprlib.dsp index 2e23afc9b..6c590c639 100644 --- a/aprlib.dsp +++ b/aprlib.dsp @@ -326,7 +326,7 @@ SOURCE=.\include\apr.h # 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 @@ SOURCE=.\include\apr_config.h # 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 diff --git a/configure.in b/configure.in index bf6b5af30..3ef0cab48 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ MODULES="file_io network_io threadproc misc locks time mmap shmem dso i18n" 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' diff --git a/dso/aix/Makefile.in b/dso/aix/Makefile.in index ffc2c0f2e..56714ed3a 100644 --- a/dso/aix/Makefile.in +++ b/dso/aix/Makefile.in @@ -49,12 +49,12 @@ depend: && 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 \ diff --git a/dso/aix/dso.h b/dso/aix/dso.h index ec6d5bf7a..392a92015 100644 --- a/dso/aix/dso.h +++ b/dso/aix/dso.h @@ -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" diff --git a/dso/beos/Makefile.in b/dso/beos/Makefile.in index b60dd9541..6c5788d86 100644 --- a/dso/beos/Makefile.in +++ b/dso/beos/Makefile.in @@ -48,12 +48,12 @@ depend: && 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 \ diff --git a/dso/beos/dso.h b/dso/beos/dso.h index 6e65454d9..2666d779a 100644 --- a/dso/beos/dso.h +++ b/dso/beos/dso.h @@ -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" diff --git a/dso/os2/Makefile.in b/dso/os2/Makefile.in index b9f92d187..8fadaff4b 100644 --- a/dso/os2/Makefile.in +++ b/dso/os2/Makefile.in @@ -49,7 +49,7 @@ depend: && 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 \ diff --git a/dso/os2/dso.h b/dso/os2/dso.h index 1466a03b9..02855bb0c 100644 --- a/dso/os2/dso.h +++ b/dso/os2/dso.h @@ -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" diff --git a/dso/unix/Makefile.in b/dso/unix/Makefile.in index e0f68e103..0be9515cc 100644 --- a/dso/unix/Makefile.in +++ b/dso/unix/Makefile.in @@ -49,7 +49,7 @@ depend: && 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 \ diff --git a/dso/unix/dso.h b/dso/unix/dso.h index 01a1c9c59..67bf85104 100644 --- a/dso/unix/dso.h +++ b/dso/unix/dso.h @@ -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" diff --git a/dso/win32/dso.h b/dso/win32/dso.h index 45b74420b..745db192d 100644 --- a/dso/win32/dso.h +++ b/dso/win32/dso.h @@ -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" diff --git a/file_io/beos/Makefile.in b/file_io/beos/Makefile.in index 39bb18b38..c06254b2d 100644 --- a/file_io/beos/Makefile.in +++ b/file_io/beos/Makefile.in @@ -50,14 +50,14 @@ depend: # 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 diff --git a/file_io/os2/Makefile.in b/file_io/os2/Makefile.in index 1a31cd8b6..934134b5e 100644 --- a/file_io/os2/Makefile.in +++ b/file_io/os2/Makefile.in @@ -58,47 +58,47 @@ depend: && 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 \ diff --git a/file_io/os2/fileio.h b/file_io/os2/fileio.h index 691d15090..b2d6d6d2e 100644 --- a/file_io/os2/fileio.h +++ b/file_io/os2/fileio.h @@ -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" diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in index ce43132d0..084572d40 100644 --- a/file_io/unix/Makefile.in +++ b/file_io/unix/Makefile.in @@ -56,44 +56,45 @@ depend: && 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 \ diff --git a/file_io/unix/fileio.h b/file_io/unix/fileio.h index 499fcdfd8..1ef43ba09 100644 --- a/file_io/unix/fileio.h +++ b/file_io/unix/fileio.h @@ -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" diff --git a/file_io/win32/fileio.h b/file_io/win32/fileio.h index 150d4adfa..d73100145 100644 --- a/file_io/win32/fileio.h +++ b/file_io/win32/fileio.h @@ -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" diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c index d50b52b36..861f12b32 100644 --- a/file_io/win32/filestat.c +++ b/file_io/win32/filestat.c @@ -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" diff --git a/file_io/win32/open.c b/file_io/win32/open.c index 49ee69afa..91fa02e9f 100644 --- a/file_io/win32/open.c +++ b/file_io/win32/open.c @@ -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" diff --git a/i18n/unix/Makefile.in b/i18n/unix/Makefile.in index 9762d996c..99b728973 100644 --- a/i18n/unix/Makefile.in +++ b/i18n/unix/Makefile.in @@ -38,7 +38,7 @@ depend: && 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 \ diff --git a/i18n/unix/xlate.c b/i18n/unix/xlate.c index 9b69d169f..ce9db86c5 100644 --- a/i18n/unix/xlate.c +++ b/i18n/unix/xlate.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "apr_config.h" +#include "apr_private.h" #include "apr_lib.h" #include "apr_xlate.h" diff --git a/include/.cvsignore b/include/.cvsignore index b5bba0b11..e5db22b8d 100644 --- a/include/.cvsignore +++ b/include/.cvsignore @@ -1,3 +1,3 @@ apr.h -apr_config.h -apr_config.h.in +apr_private.h +apr_private.h.in diff --git a/include/arch/aix/dso.h b/include/arch/aix/dso.h index ec6d5bf7a..392a92015 100644 --- a/include/arch/aix/dso.h +++ b/include/arch/aix/dso.h @@ -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" diff --git a/include/arch/beos/dso.h b/include/arch/beos/dso.h index 6e65454d9..2666d779a 100644 --- a/include/arch/beos/dso.h +++ b/include/arch/beos/dso.h @@ -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" diff --git a/include/arch/os2/dso.h b/include/arch/os2/dso.h index 1466a03b9..02855bb0c 100644 --- a/include/arch/os2/dso.h +++ b/include/arch/os2/dso.h @@ -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" diff --git a/include/arch/os2/fileio.h b/include/arch/os2/fileio.h index 691d15090..b2d6d6d2e 100644 --- a/include/arch/os2/fileio.h +++ b/include/arch/os2/fileio.h @@ -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" diff --git a/include/arch/unix/dso.h b/include/arch/unix/dso.h index 01a1c9c59..67bf85104 100644 --- a/include/arch/unix/dso.h +++ b/include/arch/unix/dso.h @@ -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" diff --git a/include/arch/unix/fileio.h b/include/arch/unix/fileio.h index 499fcdfd8..1ef43ba09 100644 --- a/include/arch/unix/fileio.h +++ b/include/arch/unix/fileio.h @@ -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" diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h index e10d89086..f6d37100d 100644 --- a/include/arch/unix/locks.h +++ b/include/arch/unix/locks.h @@ -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" diff --git a/include/arch/unix/misc.h b/include/arch/unix/misc.h index 4e6b51d62..6a31d06af 100644 --- a/include/arch/unix/misc.h +++ b/include/arch/unix/misc.h @@ -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" diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h index bfb08f854..8c6fc3309 100644 --- a/include/arch/unix/networkio.h +++ b/include/arch/unix/networkio.h @@ -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" diff --git a/include/arch/unix/threadproc.h b/include/arch/unix/threadproc.h index 45fe78707..ea4c8289d 100644 --- a/include/arch/unix/threadproc.h +++ b/include/arch/unix/threadproc.h @@ -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" diff --git a/include/arch/win32/atime.h b/include/arch/win32/atime.h index d24fc4243..cf5ab4873 100644 --- a/include/arch/win32/atime.h +++ b/include/arch/win32/atime.h @@ -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> diff --git a/include/arch/win32/dso.h b/include/arch/win32/dso.h index 45b74420b..745db192d 100644 --- a/include/arch/win32/dso.h +++ b/include/arch/win32/dso.h @@ -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" diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h index 150d4adfa..d73100145 100644 --- a/include/arch/win32/fileio.h +++ b/include/arch/win32/fileio.h @@ -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" diff --git a/include/arch/win32/misc.h b/include/arch/win32/misc.h index 4e6b51d62..6a31d06af 100644 --- a/include/arch/win32/misc.h +++ b/include/arch/win32/misc.h @@ -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" diff --git a/include/arch/win32/threadproc.h b/include/arch/win32/threadproc.h index f486662bc..16667de67 100644 --- a/include/arch/win32/threadproc.h +++ b/include/arch/win32/threadproc.h @@ -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> diff --git a/lib/Makefile.in b/lib/Makefile.in index 068b5801a..d8fbc62fc 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -59,38 +59,38 @@ depend: && 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 \ diff --git a/lib/apr_cpystrn.c b/lib/apr_cpystrn.c index 5d907f98e..968b17d86 100644 --- a/lib/apr_cpystrn.c +++ b/lib/apr_cpystrn.c @@ -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 diff --git a/lib/apr_execve.c b/lib/apr_execve.c index c3ff4e2ec..e5ba0f161 100644 --- a/lib/apr_execve.c +++ b/lib/apr_execve.c @@ -87,7 +87,7 @@ * SUCH DAMAGE. */ #ifndef WIN32 -#include "apr_config.h" +#include "apr_private.h" #endif /*---------------------------------------------------------------*/ diff --git a/lib/apr_fnmatch.c b/lib/apr_fnmatch.c index c2368b105..9936917b5 100644 --- a/lib/apr_fnmatch.c +++ b/lib/apr_fnmatch.c @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; * 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" diff --git a/lib/apr_getpass.c b/lib/apr_getpass.c index 60846539f..1eaf30346 100644 --- a/lib/apr_getpass.c +++ b/lib/apr_getpass.c @@ -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> diff --git a/lib/apr_md5.c b/lib/apr_md5.c index 9debb5a31..cf436f3cd 100644 --- a/lib/apr_md5.c +++ b/lib/apr_md5.c @@ -96,7 +96,7 @@ * ---------------------------------------------------------------------------- */ #ifndef WIN32 -#include "apr_config.h" +#include "apr_private.h" #endif #include "apr_md5.h" #include "apr_lib.h" diff --git a/lib/apr_pools.c b/lib/apr_pools.c index a6200aa39..c2ba952d5 100644 --- a/lib/apr_pools.c +++ b/lib/apr_pools.c @@ -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" diff --git a/lib/apr_signal.c b/lib/apr_signal.c index b5cf771b8..9fd1164c8 100644 --- a/lib/apr_signal.c +++ b/lib/apr_signal.c @@ -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> diff --git a/lib/apr_snprintf.c b/lib/apr_snprintf.c index d47e95753..c5ea415ec 100644 --- a/lib/apr_snprintf.c +++ b/lib/apr_snprintf.c @@ -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> diff --git a/lib/apr_tables.c b/lib/apr_tables.c index f1d5ce650..79181ab82 100644 --- a/lib/apr_tables.c +++ b/lib/apr_tables.c @@ -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" diff --git a/locks/beos/Makefile.in b/locks/beos/Makefile.in index fadb88bf4..7fa364b43 100644 --- a/locks/beos/Makefile.in +++ b/locks/beos/Makefile.in @@ -52,13 +52,13 @@ depend: # 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 diff --git a/locks/os2/Makefile.in b/locks/os2/Makefile.in index 11f40a7bc..9ba454f10 100644 --- a/locks/os2/Makefile.in +++ b/locks/os2/Makefile.in @@ -56,4 +56,4 @@ locks.o: locks.c $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \ $(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 diff --git a/locks/unix/Makefile.in b/locks/unix/Makefile.in index 89d3e743c..80bd8da69 100644 --- a/locks/unix/Makefile.in +++ b/locks/unix/Makefile.in @@ -52,17 +52,17 @@ depend: && 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 \ diff --git a/locks/unix/locks.h b/locks/unix/locks.h index e10d89086..f6d37100d 100644 --- a/locks/unix/locks.h +++ b/locks/unix/locks.h @@ -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" diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index a6200aa39..c2ba952d5 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -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" diff --git a/misc/beos/Makefile.in b/misc/beos/Makefile.in index 6b5434378..f5497a37b 100644 --- a/misc/beos/Makefile.in +++ b/misc/beos/Makefile.in @@ -49,12 +49,12 @@ depend: && 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 \ diff --git a/misc/beos/misc.h b/misc/beos/misc.h index c17ded65d..269d2fe7e 100644 --- a/misc/beos/misc.h +++ b/misc/beos/misc.h @@ -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" diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in index 437538789..23c3d6c96 100644 --- a/misc/unix/Makefile.in +++ b/misc/unix/Makefile.in @@ -52,21 +52,40 @@ depend: && 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 diff --git a/misc/unix/misc.h b/misc/unix/misc.h index 4e6b51d62..6a31d06af 100644 --- a/misc/unix/misc.h +++ b/misc/unix/misc.h @@ -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" diff --git a/misc/win32/names.c b/misc/win32/names.c index 3123c95fc..d831842c9 100644 --- a/misc/win32/names.c +++ b/misc/win32/names.c @@ -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" diff --git a/misc/win32/rand.c b/misc/win32/rand.c index 78a0b1fd4..1f6770e62 100644 --- a/misc/win32/rand.c +++ b/misc/win32/rand.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "apr_config.h" +#include "apr_private.h" #include "apr_general.h" #include <wincrypt.h> diff --git a/misc/win32/start.c b/misc/win32/start.c index c776af80f..b7ece0ab7 100644 --- a/misc/win32/start.c +++ b/misc/win32/start.c @@ -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" diff --git a/mmap/beos/Makefile.in b/mmap/beos/Makefile.in index e0d116f85..eac4bf5dd 100644 --- a/mmap/beos/Makefile.in +++ b/mmap/beos/Makefile.in @@ -55,7 +55,7 @@ mmap.o: mmap.c mmap_h.h ../../include/apr_general.h \ ../../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 \ diff --git a/mmap/unix/Makefile.in b/mmap/unix/Makefile.in index fbf428216..e24de80e4 100644 --- a/mmap/unix/Makefile.in +++ b/mmap/unix/Makefile.in @@ -50,14 +50,14 @@ depend: && 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 \ diff --git a/mmap/unix/mmap_h.h b/mmap/unix/mmap_h.h index 78c91330b..fbb42b63d 100644 --- a/mmap/unix/mmap_h.h +++ b/mmap/unix/mmap_h.h @@ -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" diff --git a/network_io/beos/Makefile.in b/network_io/beos/Makefile.in index fe482348f..a8b094ef6 100644 --- a/network_io/beos/Makefile.in +++ b/network_io/beos/Makefile.in @@ -59,39 +59,39 @@ inet_aton.o: inet_aton.c networkio.h ../../include/apr_network_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 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 diff --git a/network_io/os2/Makefile.in b/network_io/os2/Makefile.in index 34120f1cd..54dfb7d33 100644 --- a/network_io/os2/Makefile.in +++ b/network_io/os2/Makefile.in @@ -73,7 +73,7 @@ sendrecv.o: sendrecv.c networkio.h $(INCDIR1)/apr_network_io.h \ $(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 \ diff --git a/network_io/unix/Makefile.in b/network_io/unix/Makefile.in index feabf11ca..ee0bc8bf6 100644 --- a/network_io/unix/Makefile.in +++ b/network_io/unix/Makefile.in @@ -53,29 +53,29 @@ depend: && 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 \ diff --git a/network_io/unix/networkio.h b/network_io/unix/networkio.h index bfb08f854..8c6fc3309 100644 --- a/network_io/unix/networkio.h +++ b/network_io/unix/networkio.h @@ -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" diff --git a/test/Makefile.in b/test/Makefile.in index a9c57f1ed..62bdc4a55 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -130,7 +130,7 @@ client.o: client.c $(INCDIR)/apr_network_io.h \ 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 \ diff --git a/threadproc/beos/Makefile.in b/threadproc/beos/Makefile.in index bbe8ae04f..c2b8c6f17 100644 --- a/threadproc/beos/Makefile.in +++ b/threadproc/beos/Makefile.in @@ -63,34 +63,34 @@ proc.o: proc.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 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 diff --git a/threadproc/os2/Makefile.in b/threadproc/os2/Makefile.in index 691e02ce0..49fcb6b02 100644 --- a/threadproc/os2/Makefile.in +++ b/threadproc/os2/Makefile.in @@ -59,22 +59,22 @@ proc.o: proc.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_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 diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c index f8812b43f..6fc0f755a 100644 --- a/threadproc/os2/proc.c +++ b/threadproc/os2/proc.c @@ -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" diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in index a764c7ecc..016f07a49 100644 --- a/threadproc/unix/Makefile.in +++ b/threadproc/unix/Makefile.in @@ -54,31 +54,37 @@ depend: && 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 \ diff --git a/threadproc/unix/threadproc.h b/threadproc/unix/threadproc.h index 45fe78707..ea4c8289d 100644 --- a/threadproc/unix/threadproc.h +++ b/threadproc/unix/threadproc.h @@ -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" diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c index b168756df..5e38f066c 100644 --- a/threadproc/win32/thread.c +++ b/threadproc/win32/thread.c @@ -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" diff --git a/threadproc/win32/threadproc.h b/threadproc/win32/threadproc.h index f486662bc..16667de67 100644 --- a/threadproc/win32/threadproc.h +++ b/threadproc/win32/threadproc.h @@ -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> diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in index 9d77b4f2f..352364d25 100644 --- a/time/unix/Makefile.in +++ b/time/unix/Makefile.in @@ -50,13 +50,13 @@ depend: && 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 \ diff --git a/time/unix/atime.h b/time/unix/atime.h index c5a5846b6..f22167486 100644 --- a/time/unix/atime.h +++ b/time/unix/atime.h @@ -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" diff --git a/time/win32/atime.h b/time/win32/atime.h index d24fc4243..cf5ab4873 100644 --- a/time/win32/atime.h +++ b/time/win32/atime.h @@ -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> |