diff options
author | thommay <thommay@13f79535-47bb-0310-9956-ffa450edef68> | 2003-01-06 23:44:40 +0000 |
---|---|---|
committer | thommay <thommay@13f79535-47bb-0310-9956-ffa450edef68> | 2003-01-06 23:44:40 +0000 |
commit | a99c451dae7e00a35d9ae1d76e8aae7d23d5f6a1 (patch) | |
tree | 48b1663bc7dba24d1459e2cf584d5f5c0cab6c71 | |
parent | e8bdc01b277a13551cb929c3ed30c6151ac303a2 (diff) | |
download | libapr-a99c451dae7e00a35d9ae1d76e8aae7d23d5f6a1.tar.gz |
Namespace protection for include/arch/ header files
aix/dso.h -> -> aix/apr_arch_dso.h
beos/dso.h -> beos/apr_arch_dso.h
beos/proc_mutex.h -> beos/apr_arch_proc_mutex.h
beos/thread_cond.h -> beos/apr_arch_thread_cond.h
beos/thread_mutex.h -> beos/apr_arch_thread_mutex.h
beos/threadproc.h -> beos/apr_arch_threadproc.h
beos/thread_rwlock.h -> beos/apr_arch_thread_rwlock.h
netware/dso.h -> -> netware/apr_arch_dso.h
netware/fileio.h -> -> netware/apr_arch_fileio.h
netware/global_mutex.h -> netware/apr_arch_global_mutex.h
netware/internal_time.h -> netware/apr_arch_internal_time.h
netware/networkio.h -> netware/apr_arch_networkio.h
netware/pre_nw.h -> netware/apr_arch_pre_nw.h
netware/proc_mutex.h -> netware/apr_arch_proc_mutex.h
netware/thread_cond.h -> netware/apr_arch_thread_cond.h
netware/thread_mutex.h -> netware/apr_arch_thread_mutex.h
netware/threadproc.h -> netware/apr_arch_threadproc.h
netware/thread_rwlock.h -> netware/apr_arch_thread_rwlock.h
os2/dso.h -> os2/apr_arch_dso.h
os2/fileio.h -> os2/apr_arch_fileio.h
os2/networkio.h -> os2/apr_arch_networkio.h
os2/os2calls.h -> os2/apr_arch_os2calls.h
os2/proc_mutex.h -> os2/apr_arch_proc_mutex.h
os2/thread_cond.h -> os2/apr_arch_thread_cond.h
os2/thread_mutex.h -> os2/apr_arch_thread_mutex.h
os2/threadproc.h -> os2/apr_arch_threadproc.h
os2/thread_rwlock.h -> os2/apr_arch_thread_rwlock.h
os390/dso.h -> os390/apr_arch_dso.h
unix/dso.h -> unix/apr_arch_dso.h
unix/fileio.h -> unix/apr_arch_fileio.h
unix/global_mutex.h -> unix/apr_arch_global_mutex.h
unix/inherit.h -> unix/apr_arch_inherit.h
unix/internal_time.h -> unix/apr_arch_internal_time.h
unix/misc.h -> unix/apr_arch_misc.h
unix/networkio.h -> unix/apr_arch_networkio.h
unix/proc_mutex.h -> unix/apr_arch_proc_mutex.h
unix/shm.h -> unix/apr_arch_shm.h
unix/thread_cond.h -> unix/apr_arch_thread_cond.h
unix/thread_mutex.h -> unix/apr_arch_thread_mutex.h
unix/threadproc.h -> unix/apr_arch_threadproc.h
unix/thread_rwlock.h -> unix/apr_arch_thread_rwlock.h
win32/atime.h -> win32/apr_arch_atime.h
win32/dso.h -> win32/apr_arch_dso.h
win32/fileio.h -> win32/apr_arch_fileio.h
win32/inherit.h -> win32/apr_arch_inherit.h
win32/misc.h -> win32/apr_arch_misc.h
win32/networkio.h -> win32/apr_arch_networkio.h
win32/proc_mutex.h -> win32/apr_arch_proc_mutex.h
win32/thread_cond.h -> win32/apr_arch_thread_cond.h
win32/thread_mutex.h -> win32/apr_arch_thread_mutex.h
win32/threadproc.h -> win32/apr_arch_threadproc.h
win32/thread_rwlock.h -> win32/apr_arch_thread_rwlock.h
win32/utf8.h -> win32/apr_arch_utf8.h
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64271 13f79535-47bb-0310-9956-ffa450edef68
180 files changed, 183 insertions, 183 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index da4819a44..704e4da79 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -152,9 +152,9 @@ ifeq "$(RELEASE)" "optimized" CFLAGS += -O4,p endif -# -prefix pre_nw.h #include pre_nw.h for all files +# -prefix apr_arch_pre_nw.h #include pre_nw.h for all files -CFLAGS += -prefix pre_nw.h +CFLAGS += -prefix apr_arch_pre_nw.h PATH:=$(PATH);$(METROWERKS)\bin;$(METROWERKS)\Other Metrowerks Tools\Command Line Tools diff --git a/dso/aix/dso.c b/dso/aix/dso.c index 7520ee6f5..713e6cbb2 100644 --- a/dso/aix/dso.c +++ b/dso/aix/dso.c @@ -87,7 +87,7 @@ #include <sys/types.h> #include <sys/ldr.h> #include <a.out.h> -#include "dso.h" +#include "apr_arch_dso.h" #include "apr_portable.h" #if APR_HAS_DSO diff --git a/dso/beos/dso.c b/dso/beos/dso.c index d26ca4b05..087ed42e8 100644 --- a/dso/beos/dso.c +++ b/dso/beos/dso.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "beos/dso.h" +#include "beos/apr_arch_dso.h" #include "apr_portable.h" #if APR_HAS_DSO diff --git a/dso/netware/dso.c b/dso/netware/dso.c index 3ccca1abc..7fd3d27e0 100644 --- a/dso/netware/dso.c +++ b/dso/netware/dso.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "dso.h" +#include "apr_arch_dso.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/dso/os2/dso.c b/dso/os2/dso.c index 768a27e9b..813c0d235 100644 --- a/dso/os2/dso.c +++ b/dso/os2/dso.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "dso.h" +#include "apr_arch_dso.h" #include "apr_strings.h" #include "apr_portable.h" #include <stdio.h> diff --git a/dso/os390/dso.c b/dso/os390/dso.c index e580e2c2c..bce8a0df9 100644 --- a/dso/os390/dso.c +++ b/dso/os390/dso.c @@ -54,7 +54,7 @@ #include "apr_portable.h" #include "apr_strings.h" -#include "dso.h" +#include "apr_arch_dso.h" #include <errno.h> #include <string.h> diff --git a/dso/unix/dso.c b/dso/unix/dso.c index 9f68e2380..69875f46a 100644 --- a/dso/unix/dso.c +++ b/dso/unix/dso.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "dso.h" +#include "apr_arch_dso.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/dso/win32/dso.c b/dso/win32/dso.c index 22e5ff5de..44a220128 100644 --- a/dso/win32/dso.c +++ b/dso/win32/dso.c @@ -52,11 +52,11 @@ * <http://www.apache.org/>. */ -#include "dso.h" +#include "apr_arch_dso.h" #include "apr_strings.h" #include "apr_private.h" -#include "fileio.h" -#include "utf8.h" +#include "apr_arch_fileio.h" +#include "apr_arch_utf8.h" #if APR_HAS_DSO diff --git a/file_io/netware/filestat.c b/file_io/netware/filestat.c index 2b99fa8cf..9b87573b2 100644 --- a/file_io/netware/filestat.c +++ b/file_io/netware/filestat.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "fsio.h" #include "nks/dirio.h" #include "apr_file_io.h" diff --git a/file_io/netware/filesys.c b/file_io/netware/filesys.c index 195e7654c..6be9110d6 100644 --- a/file_io/netware/filesys.c +++ b/file_io/netware/filesys.c @@ -53,7 +53,7 @@ */ #include "apr.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p) diff --git a/file_io/netware/flock.c b/file_io/netware/flock.c index 69be365eb..8430dc7bb 100644 --- a/file_io/netware/flock.c +++ b/file_io/netware/flock.c @@ -53,7 +53,7 @@ */ #include <nks/fsio.h> -#include "fileio.h" +#include "apr_arch_fileio.h" apr_status_t apr_file_lock(apr_file_t *thefile, int type) diff --git a/file_io/netware/pipe.c b/file_io/netware/pipe.c index a3f7d0a57..1029e1fab 100644 --- a/file_io/netware/pipe.c +++ b/file_io/netware/pipe.c @@ -56,7 +56,7 @@ #include <nks/fsio.h> #include <nks/errno.h> -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c index b2ad12f68..a79f74a3b 100644 --- a/file_io/os2/dir.c +++ b/file_io/os2/dir.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_lib.h" #include "apr_strings.h" diff --git a/file_io/os2/filedup.c b/file_io/os2/filedup.c index 3b74d0e02..323fc0876 100644 --- a/file_io/os2/filedup.c +++ b/file_io/os2/filedup.c @@ -52,12 +52,12 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_lib.h" #include "apr_strings.h" #include <string.h> -#include "inherit.h" +#include "apr_arch_inherit.h" static apr_status_t file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p) { diff --git a/file_io/os2/filestat.c b/file_io/os2/filestat.c index 274d36970..4e3aa6928 100644 --- a/file_io/os2/filestat.c +++ b/file_io/os2/filestat.c @@ -54,7 +54,7 @@ #define INCL_DOS #define INCL_DOSERRORS -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_lib.h" #include <sys/time.h> diff --git a/file_io/os2/filesys.c b/file_io/os2/filesys.c index c82f26aaf..df7c8f8ee 100644 --- a/file_io/os2/filesys.c +++ b/file_io/os2/filesys.c @@ -53,7 +53,7 @@ */ #include "apr.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_lib.h" #include <ctype.h> diff --git a/file_io/os2/flock.c b/file_io/os2/flock.c index 68ad421db..1bcee8f0d 100644 --- a/file_io/os2/flock.c +++ b/file_io/os2/flock.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type) { diff --git a/file_io/os2/maperrorcode.c b/file_io/os2/maperrorcode.c index 4eaace7b7..5224f50f3 100644 --- a/file_io/os2/maperrorcode.c +++ b/file_io/os2/maperrorcode.c @@ -53,7 +53,7 @@ */ #define INCL_DOSERRORS -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include <errno.h> #include <string.h> diff --git a/file_io/os2/open.c b/file_io/os2/open.c index 68bf48fa8..66203ff0f 100644 --- a/file_io/os2/open.c +++ b/file_io/os2/open.c @@ -52,12 +52,12 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_lib.h" #include "apr_portable.h" #include "apr_strings.h" -#include "inherit.h" +#include "apr_arch_inherit.h" #include <string.h> apr_status_t apr_file_cleanup(void *thefile) diff --git a/file_io/os2/pipe.c b/file_io/os2/pipe.c index 06e9ca123..8de90075f 100644 --- a/file_io/os2/pipe.c +++ b/file_io/os2/pipe.c @@ -53,7 +53,7 @@ */ #define INCL_DOSERRORS -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_lib.h" diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c index 4644bf728..cb73a5d1b 100644 --- a/file_io/os2/readwrite.c +++ b/file_io/os2/readwrite.c @@ -55,7 +55,7 @@ #define INCL_DOS #define INCL_DOSERRORS -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_lib.h" #include "apr_strings.h" diff --git a/file_io/os2/seek.c b/file_io/os2/seek.c index 02954c4a1..38625d998 100644 --- a/file_io/os2/seek.c +++ b/file_io/os2/seek.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_lib.h" #include <string.h> diff --git a/file_io/unix/copy.c b/file_io/unix/copy.c index 609b5acec..966c7e753 100644 --- a/file_io/unix/copy.c +++ b/file_io/unix/copy.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" static apr_status_t apr_file_transfer_contents(const char *from_path, diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c index f61a7ea99..ac5beec1f 100644 --- a/file_io/unix/dir.c +++ b/file_io/unix/dir.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_portable.h" #if APR_HAVE_SYS_SYSLIMITS_H diff --git a/file_io/unix/fileacc.c b/file_io/unix/fileacc.c index fd2fab488..a442acb0a 100644 --- a/file_io/unix/fileacc.c +++ b/file_io/unix/fileacc.c @@ -53,7 +53,7 @@ */ #include "apr_strings.h" -#include "fileio.h" +#include "apr_arch_fileio.h" /* A file to put ALL of the accessor functions for apr_file_t types. */ diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c index d70c98b87..67ac48949 100644 --- a/file_io/unix/filedup.c +++ b/file_io/unix/filedup.c @@ -52,11 +52,11 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_portable.h" #include "apr_thread_mutex.h" -#include "inherit.h" +#include "apr_arch_inherit.h" static apr_status_t _file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p, diff --git a/file_io/unix/filepath.c b/file_io/unix/filepath.c index 004146adf..d2baabedb 100644 --- a/file_io/unix/filepath.c +++ b/file_io/unix/filepath.c @@ -53,7 +53,7 @@ */ #include "apr.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_strings.h" #define APR_WANT_STRFUNC diff --git a/file_io/unix/filestat.c b/file_io/unix/filestat.c index 85729a9f6..2448d2347 100644 --- a/file_io/unix/filestat.c +++ b/file_io/unix/filestat.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_strings.h" diff --git a/file_io/unix/flock.c b/file_io/unix/flock.c index 0de18efc5..c1ba8844f 100644 --- a/file_io/unix/flock.c +++ b/file_io/unix/flock.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #if APR_HAVE_FCNTL_H #include <fcntl.h> diff --git a/file_io/unix/mktemp.c b/file_io/unix/mktemp.c index cc1e02002..553d6b4d8 100644 --- a/file_io/unix/mktemp.c +++ b/file_io/unix/mktemp.c @@ -87,7 +87,7 @@ #include "apr_private.h" #include "apr_file_io.h" /* prototype of apr_mkstemp() */ #include "apr_strings.h" /* prototype of apr_mkstemp() */ -#include "fileio.h" /* prototype of apr_mkstemp() */ +#include "apr_arch_fileio.h" /* prototype of apr_mkstemp() */ #include "apr_portable.h" /* for apr_os_file_put() */ #ifndef HAVE_MKSTEMP diff --git a/file_io/unix/open.c b/file_io/unix/open.c index fb42e9e05..dc7acf65a 100644 --- a/file_io/unix/open.c +++ b/file_io/unix/open.c @@ -52,11 +52,11 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_portable.h" #include "apr_thread_mutex.h" -#include "inherit.h" +#include "apr_arch_inherit.h" #ifdef NETWARE #include "nks/dirio.h" diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c index 5e8e63edc..9c7698624 100644 --- a/file_io/unix/pipe.c +++ b/file_io/unix/pipe.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c index 2bb607edd..46bb9b165 100644 --- a/file_io/unix/readwrite.c +++ b/file_io/unix/readwrite.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_thread_mutex.h" #include "apr_support.h" diff --git a/file_io/unix/seek.c b/file_io/unix/seek.c index f3d740ee9..374ab35e7 100644 --- a/file_io/unix/seek.c +++ b/file_io/unix/seek.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" static apr_status_t setptr(apr_file_t *thefile, unsigned long pos ) { diff --git a/file_io/win32/dir.c b/file_io/win32/dir.c index 2b3e201e4..4b86ad427 100644 --- a/file_io/win32/dir.c +++ b/file_io/win32/dir.c @@ -53,11 +53,11 @@ */ #include "apr.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_strings.h" #include "apr_portable.h" -#include "atime.h" +#include "apr_arch_atime.h" #if APR_HAVE_ERRNO_H #include <errno.h> diff --git a/file_io/win32/filedup.c b/file_io/win32/filedup.c index 2fee42925..7e1b01135 100644 --- a/file_io/win32/filedup.c +++ b/file_io/win32/filedup.c @@ -52,12 +52,12 @@ * <http://www.apache.org/>. */ -#include "win32/fileio.h" +#include "win32/apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_strings.h" #include <string.h> -#include "inherit.h" +#include "apr_arch_inherit.h" APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p) diff --git a/file_io/win32/filepath.c b/file_io/win32/filepath.c index 184026f3a..f1400cb7a 100644 --- a/file_io/win32/filepath.c +++ b/file_io/win32/filepath.c @@ -53,7 +53,7 @@ */ #include "apr.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_lib.h" #include <string.h> diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c index 4743cbb21..a06d1383c 100644 --- a/file_io/win32/filestat.c +++ b/file_io/win32/filestat.c @@ -55,15 +55,15 @@ #include "apr.h" #include <aclapi.h> #include "apr_private.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_strings.h" #include "apr_errno.h" #include "apr_time.h" #include <sys/stat.h> -#include "atime.h" -#include "misc.h" +#include "apr_arch_atime.h" +#include "apr_arch_misc.h" /* We have to assure that the file name contains no '*'s, or other * wildcards when using FindFirstFile to recover the true file name. diff --git a/file_io/win32/filesys.c b/file_io/win32/filesys.c index 094d18cce..b67d4fef6 100644 --- a/file_io/win32/filesys.c +++ b/file_io/win32/filesys.c @@ -53,7 +53,7 @@ */ #include "apr.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" /* Win32 Exceptions: diff --git a/file_io/win32/flock.c b/file_io/win32/flock.c index fa01aa730..386d811bb 100644 --- a/file_io/win32/flock.c +++ b/file_io/win32/flock.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "fileio.h" +#include "apr_arch_fileio.h" APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type) { diff --git a/file_io/win32/open.c b/file_io/win32/open.c index f87525c7d..c75d78821 100644 --- a/file_io/win32/open.c +++ b/file_io/win32/open.c @@ -53,7 +53,7 @@ */ #include "apr_private.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_strings.h" @@ -67,8 +67,8 @@ #if APR_HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#include "misc.h" -#include "inherit.h" +#include "apr_arch_misc.h" +#include "apr_arch_inherit.h" #if APR_HAS_UNICODE_FS apr_status_t utf8_to_unicode_path(apr_wchar_t* retstr, apr_size_t retlen, diff --git a/file_io/win32/pipe.c b/file_io/win32/pipe.c index d216af13e..9f8401f17 100644 --- a/file_io/win32/pipe.c +++ b/file_io/win32/pipe.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "win32/fileio.h" +#include "win32/apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_strings.h" @@ -67,7 +67,7 @@ #if APR_HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#include "misc.h" +#include "apr_arch_misc.h" APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout) { diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c index fdec00a59..a61f36877 100644 --- a/file_io/win32/readwrite.c +++ b/file_io/win32/readwrite.c @@ -52,15 +52,15 @@ * <http://www.apache.org/>. */ -#include "win32/fileio.h" +#include "win32/apr_arch_fileio.h" #include "apr_file_io.h" #include "apr_general.h" #include "apr_strings.h" #include "apr_lib.h" #include "apr_errno.h" #include <malloc.h> -#include "atime.h" -#include "misc.h" +#include "apr_arch_atime.h" +#include "apr_arch_misc.h" /* * read_with_timeout() diff --git a/file_io/win32/seek.c b/file_io/win32/seek.c index 9b81d90bf..105eb7962 100644 --- a/file_io/win32/seek.c +++ b/file_io/win32/seek.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "win32/fileio.h" +#include "win32/apr_arch_fileio.h" #include "apr_file_io.h" #include <errno.h> #include <string.h> diff --git a/include/arch/aix/dso.h b/include/arch/aix/apr_arch_dso.h index 0e4ee6554..0e4ee6554 100644 --- a/include/arch/aix/dso.h +++ b/include/arch/aix/apr_arch_dso.h diff --git a/include/arch/beos/dso.h b/include/arch/beos/apr_arch_dso.h index c37f9f228..c37f9f228 100644 --- a/include/arch/beos/dso.h +++ b/include/arch/beos/apr_arch_dso.h diff --git a/include/arch/beos/proc_mutex.h b/include/arch/beos/apr_arch_proc_mutex.h index fbea2d32f..fbea2d32f 100644 --- a/include/arch/beos/proc_mutex.h +++ b/include/arch/beos/apr_arch_proc_mutex.h diff --git a/include/arch/beos/thread_cond.h b/include/arch/beos/apr_arch_thread_cond.h index 8bcbb7262..8bcbb7262 100644 --- a/include/arch/beos/thread_cond.h +++ b/include/arch/beos/apr_arch_thread_cond.h diff --git a/include/arch/beos/thread_mutex.h b/include/arch/beos/apr_arch_thread_mutex.h index 1667925ee..1667925ee 100644 --- a/include/arch/beos/thread_mutex.h +++ b/include/arch/beos/apr_arch_thread_mutex.h diff --git a/include/arch/beos/thread_rwlock.h b/include/arch/beos/apr_arch_thread_rwlock.h index 4b3fcafda..4b3fcafda 100644 --- a/include/arch/beos/thread_rwlock.h +++ b/include/arch/beos/apr_arch_thread_rwlock.h diff --git a/include/arch/beos/threadproc.h b/include/arch/beos/apr_arch_threadproc.h index 5d5e7ef7c..5d5e7ef7c 100644 --- a/include/arch/beos/threadproc.h +++ b/include/arch/beos/apr_arch_threadproc.h diff --git a/include/arch/netware/dso.h b/include/arch/netware/apr_arch_dso.h index 926cf4c29..926cf4c29 100644 --- a/include/arch/netware/dso.h +++ b/include/arch/netware/apr_arch_dso.h diff --git a/include/arch/netware/fileio.h b/include/arch/netware/apr_arch_fileio.h index 7779c2c20..7779c2c20 100644 --- a/include/arch/netware/fileio.h +++ b/include/arch/netware/apr_arch_fileio.h diff --git a/include/arch/netware/global_mutex.h b/include/arch/netware/apr_arch_global_mutex.h index b5c8db2f5..b5c8db2f5 100644 --- a/include/arch/netware/global_mutex.h +++ b/include/arch/netware/apr_arch_global_mutex.h diff --git a/include/arch/netware/internal_time.h b/include/arch/netware/apr_arch_internal_time.h index 4fe53df8b..4fe53df8b 100644 --- a/include/arch/netware/internal_time.h +++ b/include/arch/netware/apr_arch_internal_time.h diff --git a/include/arch/netware/networkio.h b/include/arch/netware/apr_arch_networkio.h index 812c1bba4..812c1bba4 100644 --- a/include/arch/netware/networkio.h +++ b/include/arch/netware/apr_arch_networkio.h diff --git a/include/arch/netware/pre_nw.h b/include/arch/netware/apr_arch_pre_nw.h index 1078b1f16..1078b1f16 100644 --- a/include/arch/netware/pre_nw.h +++ b/include/arch/netware/apr_arch_pre_nw.h diff --git a/include/arch/netware/proc_mutex.h b/include/arch/netware/apr_arch_proc_mutex.h index 01541d3a1..01541d3a1 100644 --- a/include/arch/netware/proc_mutex.h +++ b/include/arch/netware/apr_arch_proc_mutex.h diff --git a/include/arch/netware/thread_cond.h b/include/arch/netware/apr_arch_thread_cond.h index 551a99239..551a99239 100644 --- a/include/arch/netware/thread_cond.h +++ b/include/arch/netware/apr_arch_thread_cond.h diff --git a/include/arch/netware/thread_mutex.h b/include/arch/netware/apr_arch_thread_mutex.h index 5dc9247ae..5dc9247ae 100644 --- a/include/arch/netware/thread_mutex.h +++ b/include/arch/netware/apr_arch_thread_mutex.h diff --git a/include/arch/netware/thread_rwlock.h b/include/arch/netware/apr_arch_thread_rwlock.h index e07ac70c6..e07ac70c6 100644 --- a/include/arch/netware/thread_rwlock.h +++ b/include/arch/netware/apr_arch_thread_rwlock.h diff --git a/include/arch/netware/threadproc.h b/include/arch/netware/apr_arch_threadproc.h index a9d78f029..a9d78f029 100644 --- a/include/arch/netware/threadproc.h +++ b/include/arch/netware/apr_arch_threadproc.h diff --git a/include/arch/os2/dso.h b/include/arch/os2/apr_arch_dso.h index 86b92678b..86b92678b 100644 --- a/include/arch/os2/dso.h +++ b/include/arch/os2/apr_arch_dso.h diff --git a/include/arch/os2/fileio.h b/include/arch/os2/apr_arch_fileio.h index 3fb44bdd6..3fb44bdd6 100644 --- a/include/arch/os2/fileio.h +++ b/include/arch/os2/apr_arch_fileio.h diff --git a/include/arch/os2/networkio.h b/include/arch/os2/apr_arch_networkio.h index d2ce66502..d2ce66502 100644 --- a/include/arch/os2/networkio.h +++ b/include/arch/os2/apr_arch_networkio.h diff --git a/include/arch/os2/os2calls.h b/include/arch/os2/apr_arch_os2calls.h index 518d45b89..518d45b89 100644 --- a/include/arch/os2/os2calls.h +++ b/include/arch/os2/apr_arch_os2calls.h diff --git a/include/arch/os2/proc_mutex.h b/include/arch/os2/apr_arch_proc_mutex.h index f1e03013c..f1e03013c 100644 --- a/include/arch/os2/proc_mutex.h +++ b/include/arch/os2/apr_arch_proc_mutex.h diff --git a/include/arch/os2/thread_cond.h b/include/arch/os2/apr_arch_thread_cond.h index 9e31a0af0..9e31a0af0 100644 --- a/include/arch/os2/thread_cond.h +++ b/include/arch/os2/apr_arch_thread_cond.h diff --git a/include/arch/os2/thread_mutex.h b/include/arch/os2/apr_arch_thread_mutex.h index 2a3979b23..2a3979b23 100644 --- a/include/arch/os2/thread_mutex.h +++ b/include/arch/os2/apr_arch_thread_mutex.h diff --git a/include/arch/os2/thread_rwlock.h b/include/arch/os2/apr_arch_thread_rwlock.h index 460843fd9..460843fd9 100644 --- a/include/arch/os2/thread_rwlock.h +++ b/include/arch/os2/apr_arch_thread_rwlock.h diff --git a/include/arch/os2/threadproc.h b/include/arch/os2/apr_arch_threadproc.h index f077366ab..f077366ab 100644 --- a/include/arch/os2/threadproc.h +++ b/include/arch/os2/apr_arch_threadproc.h diff --git a/include/arch/os390/dso.h b/include/arch/os390/apr_arch_dso.h index af5297d4c..af5297d4c 100644 --- a/include/arch/os390/dso.h +++ b/include/arch/os390/apr_arch_dso.h diff --git a/include/arch/unix/dso.h b/include/arch/unix/apr_arch_dso.h index cf47659cc..cf47659cc 100644 --- a/include/arch/unix/dso.h +++ b/include/arch/unix/apr_arch_dso.h diff --git a/include/arch/unix/fileio.h b/include/arch/unix/apr_arch_fileio.h index de5a49faf..de5a49faf 100644 --- a/include/arch/unix/fileio.h +++ b/include/arch/unix/apr_arch_fileio.h diff --git a/include/arch/unix/global_mutex.h b/include/arch/unix/apr_arch_global_mutex.h index 45e3e0622..45e3e0622 100644 --- a/include/arch/unix/global_mutex.h +++ b/include/arch/unix/apr_arch_global_mutex.h diff --git a/include/arch/unix/inherit.h b/include/arch/unix/apr_arch_inherit.h index babb25528..babb25528 100644 --- a/include/arch/unix/inherit.h +++ b/include/arch/unix/apr_arch_inherit.h diff --git a/include/arch/unix/internal_time.h b/include/arch/unix/apr_arch_internal_time.h index a0541594e..a0541594e 100644 --- a/include/arch/unix/internal_time.h +++ b/include/arch/unix/apr_arch_internal_time.h diff --git a/include/arch/unix/misc.h b/include/arch/unix/apr_arch_misc.h index 36b9d5c16..36b9d5c16 100644 --- a/include/arch/unix/misc.h +++ b/include/arch/unix/apr_arch_misc.h diff --git a/include/arch/unix/networkio.h b/include/arch/unix/apr_arch_networkio.h index 9e95b9fd1..9e95b9fd1 100644 --- a/include/arch/unix/networkio.h +++ b/include/arch/unix/apr_arch_networkio.h diff --git a/include/arch/unix/proc_mutex.h b/include/arch/unix/apr_arch_proc_mutex.h index da76da2b8..da76da2b8 100644 --- a/include/arch/unix/proc_mutex.h +++ b/include/arch/unix/apr_arch_proc_mutex.h diff --git a/include/arch/unix/shm.h b/include/arch/unix/apr_arch_shm.h index 3a3764ecf..3a3764ecf 100644 --- a/include/arch/unix/shm.h +++ b/include/arch/unix/apr_arch_shm.h diff --git a/include/arch/unix/thread_cond.h b/include/arch/unix/apr_arch_thread_cond.h index ce4f3ce9c..ce4f3ce9c 100644 --- a/include/arch/unix/thread_cond.h +++ b/include/arch/unix/apr_arch_thread_cond.h diff --git a/include/arch/unix/thread_mutex.h b/include/arch/unix/apr_arch_thread_mutex.h index 20e72a7ce..20e72a7ce 100644 --- a/include/arch/unix/thread_mutex.h +++ b/include/arch/unix/apr_arch_thread_mutex.h diff --git a/include/arch/unix/thread_rwlock.h b/include/arch/unix/apr_arch_thread_rwlock.h index c19cd3710..c19cd3710 100644 --- a/include/arch/unix/thread_rwlock.h +++ b/include/arch/unix/apr_arch_thread_rwlock.h diff --git a/include/arch/unix/threadproc.h b/include/arch/unix/apr_arch_threadproc.h index 44edbdad5..44edbdad5 100644 --- a/include/arch/unix/threadproc.h +++ b/include/arch/unix/apr_arch_threadproc.h diff --git a/include/arch/win32/atime.h b/include/arch/win32/apr_arch_atime.h index 67acd7257..67acd7257 100644 --- a/include/arch/win32/atime.h +++ b/include/arch/win32/apr_arch_atime.h diff --git a/include/arch/win32/dso.h b/include/arch/win32/apr_arch_dso.h index deece8bcd..deece8bcd 100644 --- a/include/arch/win32/dso.h +++ b/include/arch/win32/apr_arch_dso.h diff --git a/include/arch/win32/fileio.h b/include/arch/win32/apr_arch_fileio.h index 1e95221f8..1e95221f8 100644 --- a/include/arch/win32/fileio.h +++ b/include/arch/win32/apr_arch_fileio.h diff --git a/include/arch/win32/inherit.h b/include/arch/win32/apr_arch_inherit.h index 4d0967bb1..4d0967bb1 100644 --- a/include/arch/win32/inherit.h +++ b/include/arch/win32/apr_arch_inherit.h diff --git a/include/arch/win32/misc.h b/include/arch/win32/apr_arch_misc.h index 5ce8de30e..5ce8de30e 100644 --- a/include/arch/win32/misc.h +++ b/include/arch/win32/apr_arch_misc.h diff --git a/include/arch/win32/networkio.h b/include/arch/win32/apr_arch_networkio.h index db7fb5b3d..db7fb5b3d 100644 --- a/include/arch/win32/networkio.h +++ b/include/arch/win32/apr_arch_networkio.h diff --git a/include/arch/win32/proc_mutex.h b/include/arch/win32/apr_arch_proc_mutex.h index 259bac6e3..259bac6e3 100644 --- a/include/arch/win32/proc_mutex.h +++ b/include/arch/win32/apr_arch_proc_mutex.h diff --git a/include/arch/win32/thread_cond.h b/include/arch/win32/apr_arch_thread_cond.h index 6f1f6fa07..6f1f6fa07 100644 --- a/include/arch/win32/thread_cond.h +++ b/include/arch/win32/apr_arch_thread_cond.h diff --git a/include/arch/win32/thread_mutex.h b/include/arch/win32/apr_arch_thread_mutex.h index c8c38f59b..c8c38f59b 100644 --- a/include/arch/win32/thread_mutex.h +++ b/include/arch/win32/apr_arch_thread_mutex.h diff --git a/include/arch/win32/thread_rwlock.h b/include/arch/win32/apr_arch_thread_rwlock.h index 50d0e6ce7..50d0e6ce7 100644 --- a/include/arch/win32/thread_rwlock.h +++ b/include/arch/win32/apr_arch_thread_rwlock.h diff --git a/include/arch/win32/threadproc.h b/include/arch/win32/apr_arch_threadproc.h index 33f3fd288..33f3fd288 100644 --- a/include/arch/win32/threadproc.h +++ b/include/arch/win32/apr_arch_threadproc.h diff --git a/include/arch/win32/utf8.h b/include/arch/win32/apr_arch_utf8.h index 601d485be..601d485be 100644 --- a/include/arch/win32/utf8.h +++ b/include/arch/win32/apr_arch_utf8.h diff --git a/locks/beos/proc_mutex.c b/locks/beos/proc_mutex.c index 25dc318b1..405a0b15e 100644 --- a/locks/beos/proc_mutex.c +++ b/locks/beos/proc_mutex.c @@ -56,7 +56,7 @@ * Stephen Beaulieu <hippo@be.com> */ -#include "beos/proc_mutex.h" +#include "beos/apr_arch_proc_mutex.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/locks/beos/thread_cond.c b/locks/beos/thread_cond.c index fdb9a5a65..99908faeb 100644 --- a/locks/beos/thread_cond.c +++ b/locks/beos/thread_cond.c @@ -52,8 +52,8 @@ * <http://www.apache.org/>. */ -#include "beos/thread_mutex.h" -#include "beos/thread_cond.h" +#include "beos/apr_arch_thread_mutex.h" +#include "beos/apr_arch_thread_cond.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/locks/beos/thread_mutex.c b/locks/beos/thread_mutex.c index 414909b5d..99b4de8d2 100644 --- a/locks/beos/thread_mutex.c +++ b/locks/beos/thread_mutex.c @@ -56,7 +56,7 @@ * Stephen Beaulieu <hippo@be.com> */ -#include "beos/thread_mutex.h" +#include "beos/apr_arch_thread_mutex.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/locks/beos/thread_rwlock.c b/locks/beos/thread_rwlock.c index 651354a11..984f0edd2 100644 --- a/locks/beos/thread_rwlock.c +++ b/locks/beos/thread_rwlock.c @@ -56,7 +56,7 @@ * Stephen Beaulieu <hippo@be.com> */ -#include "beos/thread_rwlock.h" +#include "beos/apr_arch_thread_rwlock.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/locks/netware/proc_mutex.c b/locks/netware/proc_mutex.c index 3e610a6d6..075d98305 100644 --- a/locks/netware/proc_mutex.c +++ b/locks/netware/proc_mutex.c @@ -55,8 +55,8 @@ #include "apr.h" #include "apr_private.h" #include "apr_portable.h" -#include "proc_mutex.h" -#include "thread_mutex.h" +#include "apr_arch_proc_mutex.h" +#include "apr_arch_thread_mutex.h" APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex, const char *fname, diff --git a/locks/netware/thread_cond.c b/locks/netware/thread_cond.c index 190c9a39c..85debe2f1 100644 --- a/locks/netware/thread_cond.c +++ b/locks/netware/thread_cond.c @@ -58,8 +58,8 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_strings.h" -#include "thread_mutex.h" -#include "thread_cond.h" +#include "apr_arch_thread_mutex.h" +#include "apr_arch_thread_cond.h" #include "apr_portable.h" static apr_status_t thread_cond_cleanup(void *data) diff --git a/locks/netware/thread_mutex.c b/locks/netware/thread_mutex.c index b4edf2efd..d1c4f62bf 100644 --- a/locks/netware/thread_mutex.c +++ b/locks/netware/thread_mutex.c @@ -56,7 +56,7 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_strings.h" -#include "thread_mutex.h" +#include "apr_arch_thread_mutex.h" #include "apr_portable.h" static apr_status_t thread_mutex_cleanup(void *data) diff --git a/locks/netware/thread_rwlock.c b/locks/netware/thread_rwlock.c index 3c2740278..a1ba28b80 100644 --- a/locks/netware/thread_rwlock.c +++ b/locks/netware/thread_rwlock.c @@ -56,7 +56,7 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_strings.h" -#include "thread_rwlock.h" +#include "apr_arch_thread_rwlock.h" #include "apr_portable.h" static apr_status_t thread_rwlock_cleanup(void *data) diff --git a/locks/os2/proc_mutex.c b/locks/os2/proc_mutex.c index 6dcba8359..2009532b6 100644 --- a/locks/os2/proc_mutex.c +++ b/locks/os2/proc_mutex.c @@ -56,8 +56,8 @@ #include "apr_lib.h" #include "apr_strings.h" #include "apr_portable.h" -#include "proc_mutex.h" -#include "fileio.h" +#include "apr_arch_proc_mutex.h" +#include "apr_arch_fileio.h" #include <string.h> #include <stddef.h> diff --git a/locks/os2/thread_cond.c b/locks/os2/thread_cond.c index 16049867f..9f317370f 100644 --- a/locks/os2/thread_cond.c +++ b/locks/os2/thread_cond.c @@ -56,9 +56,9 @@ #include "apr_lib.h" #include "apr_strings.h" #include "apr_portable.h" -#include "thread_mutex.h" -#include "thread_cond.h" -#include "fileio.h" +#include "apr_arch_thread_mutex.h" +#include "apr_arch_thread_cond.h" +#include "apr_arch_fileio.h" #include <string.h> APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond, diff --git a/locks/os2/thread_mutex.c b/locks/os2/thread_mutex.c index ef4afc9f0..3f0d7fa61 100644 --- a/locks/os2/thread_mutex.c +++ b/locks/os2/thread_mutex.c @@ -56,8 +56,8 @@ #include "apr_lib.h" #include "apr_strings.h" #include "apr_portable.h" -#include "thread_mutex.h" -#include "fileio.h" +#include "apr_arch_thread_mutex.h" +#include "apr_arch_fileio.h" #include <string.h> #include <stddef.h> diff --git a/locks/os2/thread_rwlock.c b/locks/os2/thread_rwlock.c index 55a3fd699..99b7f3be1 100644 --- a/locks/os2/thread_rwlock.c +++ b/locks/os2/thread_rwlock.c @@ -56,8 +56,8 @@ #include "apr_lib.h" #include "apr_strings.h" #include "apr_portable.h" -#include "thread_rwlock.h" -#include "fileio.h" +#include "apr_arch_thread_rwlock.h" +#include "apr_arch_fileio.h" #include <string.h> static apr_status_t thread_rwlock_cleanup(void *therwlock) diff --git a/locks/unix/global_mutex.c b/locks/unix/global_mutex.c index 02d468002..f288584d4 100644 --- a/locks/unix/global_mutex.c +++ b/locks/unix/global_mutex.c @@ -54,7 +54,7 @@ #include "apr.h" #include "apr_strings.h" -#include "global_mutex.h" +#include "apr_arch_global_mutex.h" #include "apr_proc_mutex.h" #include "apr_thread_mutex.h" #include "apr_portable.h" diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index 2f6327fa6..e1b205928 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -54,8 +54,8 @@ #include "apr.h" #include "apr_strings.h" -#include "proc_mutex.h" -#include "fileio.h" /* for apr_mkstemp() */ +#include "apr_arch_proc_mutex.h" +#include "apr_arch_fileio.h" /* for apr_mkstemp() */ APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex) { diff --git a/locks/unix/thread_cond.c b/locks/unix/thread_cond.c index bfbc43b75..a09ec3fc7 100644 --- a/locks/unix/thread_cond.c +++ b/locks/unix/thread_cond.c @@ -56,8 +56,8 @@ #if APR_HAS_THREADS -#include "thread_mutex.h" -#include "thread_cond.h" +#include "apr_arch_thread_mutex.h" +#include "apr_arch_thread_cond.h" static apr_status_t thread_cond_cleanup(void *data) { diff --git a/locks/unix/thread_mutex.c b/locks/unix/thread_mutex.c index caef8b56a..07ff34cd3 100644 --- a/locks/unix/thread_mutex.c +++ b/locks/unix/thread_mutex.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "thread_mutex.h" +#include "apr_arch_thread_mutex.h" #define APR_WANT_MEMFUNC #include "apr_want.h" diff --git a/locks/unix/thread_rwlock.c b/locks/unix/thread_rwlock.c index 74f4bb16a..acbfceb50 100644 --- a/locks/unix/thread_rwlock.c +++ b/locks/unix/thread_rwlock.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "thread_rwlock.h" +#include "apr_arch_thread_rwlock.h" #include "apr_private.h" #if APR_HAS_THREADS diff --git a/locks/win32/proc_mutex.c b/locks/win32/proc_mutex.c index 73b8a169c..6c6cf26e9 100644 --- a/locks/win32/proc_mutex.c +++ b/locks/win32/proc_mutex.c @@ -57,8 +57,8 @@ #include "apr_general.h" #include "apr_strings.h" #include "apr_portable.h" -#include "proc_mutex.h" -#include "misc.h" +#include "apr_arch_proc_mutex.h" +#include "apr_arch_misc.h" static apr_status_t proc_mutex_cleanup(void *mutex_) { diff --git a/locks/win32/thread_cond.c b/locks/win32/thread_cond.c index 33b7ad1c7..48465cbba 100644 --- a/locks/win32/thread_cond.c +++ b/locks/win32/thread_cond.c @@ -56,8 +56,8 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_strings.h" -#include "win32/thread_mutex.h" -#include "win32/thread_cond.h" +#include "win32/apr_arch_thread_mutex.h" +#include "win32/apr_arch_thread_cond.h" #include "apr_portable.h" static apr_status_t thread_cond_cleanup(void *data) diff --git a/locks/win32/thread_mutex.c b/locks/win32/thread_mutex.c index cd39f386c..ef9074d86 100644 --- a/locks/win32/thread_mutex.c +++ b/locks/win32/thread_mutex.c @@ -56,10 +56,10 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_strings.h" -#include "thread_mutex.h" +#include "apr_arch_thread_mutex.h" #include "apr_thread_mutex.h" #include "apr_portable.h" -#include "misc.h" +#include "apr_arch_misc.h" static apr_status_t thread_mutex_cleanup(void *data) { diff --git a/locks/win32/thread_rwlock.c b/locks/win32/thread_rwlock.c index 60d8b8e61..a8d6cf1bd 100644 --- a/locks/win32/thread_rwlock.c +++ b/locks/win32/thread_rwlock.c @@ -56,7 +56,7 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_strings.h" -#include "win32/thread_rwlock.h" +#include "win32/apr_arch_thread_rwlock.h" #include "apr_portable.h" static apr_status_t thread_rwlock_cleanup(void *data) diff --git a/misc/netware/start.c b/misc/netware/start.c index 93337a8c1..9c2919f45 100644 --- a/misc/netware/start.c +++ b/misc/netware/start.c @@ -57,9 +57,9 @@ #include "apr_pools.h" #include "apr_signal.h" -#include "misc.h" /* for WSAHighByte / WSALowByte */ -#include "proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ -#include "internal_time.h" +#include "apr_arch_misc.h" /* for WSAHighByte / WSALowByte */ +#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ +#include "apr_arch_internal_time.h" APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, diff --git a/misc/unix/errorcodes.c b/misc/unix/errorcodes.c index 30cafee5d..98c529cae 100644 --- a/misc/unix/errorcodes.c +++ b/misc/unix/errorcodes.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "misc.h" +#include "apr_arch_misc.h" #include "apr_strings.h" #include "apr_lib.h" #include "apr_dso.h" diff --git a/misc/unix/getopt.c b/misc/unix/getopt.c index 1e0911710..24be3c82f 100644 --- a/misc/unix/getopt.c +++ b/misc/unix/getopt.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include "misc.h" +#include "apr_arch_misc.h" #include "apr_strings.h" #include "apr_lib.h" diff --git a/misc/unix/otherchild.c b/misc/unix/otherchild.c index 8d28bb3db..cd7b7526f 100644 --- a/misc/unix/otherchild.c +++ b/misc/unix/otherchild.c @@ -56,9 +56,9 @@ #if APR_HAS_OTHER_CHILD -#include "misc.h" -#include "threadproc.h" -#include "fileio.h" +#include "apr_arch_misc.h" +#include "apr_arch_threadproc.h" +#include "apr_arch_fileio.h" #ifdef HAVE_TIME_H #include <sys/time.h> #endif diff --git a/misc/unix/rand.c b/misc/unix/rand.c index 6b396fc06..0e0683beb 100644 --- a/misc/unix/rand.c +++ b/misc/unix/rand.c @@ -56,7 +56,7 @@ #include "apr_want.h" #include "apr_general.h" -#include "misc.h" +#include "apr_arch_misc.h" #include <sys/stat.h> #if APR_HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/misc/unix/start.c b/misc/unix/start.c index f5f306cad..48c815651 100644 --- a/misc/unix/start.c +++ b/misc/unix/start.c @@ -58,8 +58,8 @@ #include "apr_signal.h" #include "apr_atomic.h" -#include "proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ -#include "internal_time.h" +#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ +#include "apr_arch_internal_time.h" APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, diff --git a/misc/win32/apr_app.c b/misc/win32/apr_app.c index ae64974f3..9f2b01c41 100644 --- a/misc/win32/apr_app.c +++ b/misc/win32/apr_app.c @@ -75,10 +75,10 @@ #include "ShellAPI.h" #include "crtdbg.h" #include "wchar.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "assert.h" #include "apr_private.h" -#include "misc.h" +#include "apr_arch_misc.h" /* This symbol is _private_, although it must be exported. */ diff --git a/misc/win32/internal.c b/misc/win32/internal.c index ee1d2c18e..f0f79950a 100644 --- a/misc/win32/internal.c +++ b/misc/win32/internal.c @@ -54,8 +54,8 @@ #include "apr_private.h" -#include "misc.h" -#include "fileio.h" +#include "apr_arch_misc.h" +#include "apr_arch_fileio.h" #include <crtdbg.h> #include <assert.h> diff --git a/misc/win32/misc.c b/misc/win32/misc.c index 53e300ea8..67d03061d 100644 --- a/misc/win32/misc.c +++ b/misc/win32/misc.c @@ -53,9 +53,9 @@ */ #include "apr_private.h" -#include "misc.h" +#include "apr_arch_misc.h" #include "crtdbg.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "assert.h" #include "apr_lib.h" diff --git a/misc/win32/rand.c b/misc/win32/rand.c index f2eb07698..29999d61b 100644 --- a/misc/win32/rand.c +++ b/misc/win32/rand.c @@ -56,7 +56,7 @@ #include "apr_private.h" #include "apr_general.h" #include "apr_portable.h" -#include "misc.h" +#include "apr_arch_misc.h" #include <wincrypt.h> diff --git a/misc/win32/start.c b/misc/win32/start.c index 2d26cf81d..0190b96b6 100644 --- a/misc/win32/start.c +++ b/misc/win32/start.c @@ -58,9 +58,9 @@ #include "apr_signal.h" #include "ShellAPI.h" -#include "misc.h" /* for WSAHighByte / WSALowByte */ +#include "apr_arch_misc.h" /* for WSAHighByte / WSALowByte */ #include "wchar.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "crtdbg.h" #include "assert.h" diff --git a/misc/win32/utf8.c b/misc/win32/utf8.c index ffa36c3dc..399caaf6c 100644 --- a/misc/win32/utf8.c +++ b/misc/win32/utf8.c @@ -55,7 +55,7 @@ #include "apr.h" #include "apr_private.h" #include "apr_errno.h" -#include "utf8.h" +#include "apr_arch_utf8.h" /* Implement the design principal specified by RFC 2718 2.2.5 * Guidelines for new URL Schemes - within the APR. diff --git a/mmap/unix/mmap.c b/mmap/unix/mmap.c index 8b32791f3..dcb08040f 100644 --- a/mmap/unix/mmap.c +++ b/mmap/unix/mmap.c @@ -58,7 +58,7 @@ #include "apr_strings.h" #include "apr_mmap.h" #include "apr_errno.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_portable.h" /* System headers required for the mmap library */ diff --git a/mmap/win32/mmap.c b/mmap/win32/mmap.c index ce21ea061..b47b64b39 100644 --- a/mmap/win32/mmap.c +++ b/mmap/win32/mmap.c @@ -57,7 +57,7 @@ #include "apr_general.h" #include "apr_mmap.h" #include "apr_errno.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include "apr_portable.h" #include "apr_strings.h" diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c index c6808cc41..45dc43587 100644 --- a/network_io/beos/sendrecv.c +++ b/network_io/beos/sendrecv.c @@ -56,7 +56,7 @@ #if BEOS_BONE /* BONE uses the unix code - woohoo */ #include "../unix/sendrecv.c" #else -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_time.h" apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read) diff --git a/network_io/os2/os2calls.c b/network_io/os2/os2calls.c index da8f61b62..fc011588d 100644 --- a/network_io/os2/os2calls.c +++ b/network_io/os2/os2calls.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_network_io.h" #include "apr_portable.h" #include "apr_general.h" diff --git a/network_io/os2/sendrecv.c b/network_io/os2/sendrecv.c index ce0e65a06..654ba917a 100644 --- a/network_io/os2/sendrecv.c +++ b/network_io/os2/sendrecv.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_errno.h" #include "apr_general.h" #include "apr_network_io.h" diff --git a/network_io/os2/sendrecv_udp.c b/network_io/os2/sendrecv_udp.c index e04dfed2f..55c7a9341 100644 --- a/network_io/os2/sendrecv_udp.c +++ b/network_io/os2/sendrecv_udp.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_errno.h" #include "apr_general.h" #include "apr_network_io.h" diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c index ed07e1adf..cd3b084f5 100644 --- a/network_io/os2/sockets.c +++ b/network_io/os2/sockets.c @@ -52,8 +52,8 @@ * <http://www.apache.org/>. */ -#include "networkio.h" -#include "inherit.h" +#include "apr_arch_networkio.h" +#include "apr_arch_inherit.h" #include "apr_network_io.h" #include "apr_general.h" #include "apr_portable.h" @@ -65,7 +65,7 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <netdb.h> -#include "os2calls.h" +#include "apr_arch_os2calls.h" static apr_status_t socket_cleanup(void *sock) { diff --git a/network_io/os2/sockopt.c b/network_io/os2/sockopt.c index 0af2e471f..b23dd294d 100644 --- a/network_io/os2/sockopt.c +++ b/network_io/os2/sockopt.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_network_io.h" #include "apr_general.h" #include "apr_lib.h" diff --git a/network_io/unix/inet_ntop.c b/network_io/unix/inet_ntop.c index 9cd78852e..451e9a0fb 100644 --- a/network_io/unix/inet_ntop.c +++ b/network_io/unix/inet_ntop.c @@ -15,7 +15,7 @@ */ #include "apr_private.h" -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_strings.h" #if APR_HAVE_SYS_TYPES_H diff --git a/network_io/unix/inet_pton.c b/network_io/unix/inet_pton.c index 39aa7204c..550ab2a44 100644 --- a/network_io/unix/inet_pton.c +++ b/network_io/unix/inet_pton.c @@ -15,7 +15,7 @@ */ #include "apr_private.h" -#include "networkio.h" +#include "apr_arch_networkio.h" #if APR_HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c index e9056f8af..cff70c283 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -52,12 +52,12 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_support.h" #if APR_HAS_SENDFILE /* This file is needed to allow us access to the apr_file_t internals. */ -#include "fileio.h" +#include "apr_arch_fileio.h" #endif /* APR_HAS_SENDFILE */ /* sys/sysctl.h is only needed on FreeBSD for include_hdrs_in_length() */ diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index ca5b7c18a..9408cde55 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_strings.h" #include "apr.h" #include "apr_lib.h" diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c index a41e76754..3ae028d08 100644 --- a/network_io/unix/sockets.c +++ b/network_io/unix/sockets.c @@ -52,11 +52,11 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_network_io.h" #include "apr_support.h" #include "apr_portable.h" -#include "inherit.h" +#include "apr_arch_inherit.h" #if defined(BEOS) && !defined(BEOS_BONE) #define close closesocket diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c index 47d71fb7f..4e9da3020 100644 --- a/network_io/unix/sockopt.c +++ b/network_io/unix/sockopt.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_strings.h" static apr_status_t soblock(int sd) diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c index dceb5a8fe..6f71956d1 100644 --- a/network_io/win32/sendrecv.c +++ b/network_io/win32/sendrecv.c @@ -52,12 +52,12 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_errno.h" #include "apr_general.h" #include "apr_network_io.h" #include "apr_lib.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #if APR_HAVE_TIME_H #include <time.h> #endif diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c index 31cc17d96..10f648118 100644 --- a/network_io/win32/sockets.c +++ b/network_io/win32/sockets.c @@ -52,14 +52,14 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_network_io.h" #include "apr_general.h" #include "apr_lib.h" #include "apr_portable.h" #include <string.h> -#include "inherit.h" -#include "misc.h" +#include "apr_arch_inherit.h" +#include "apr_arch_misc.h" static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */ diff --git a/network_io/win32/sockopt.c b/network_io/win32/sockopt.c index d734ea2f2..715c3485f 100644 --- a/network_io/win32/sockopt.c +++ b/network_io/win32/sockopt.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "networkio.h" +#include "apr_arch_networkio.h" #include "apr_network_io.h" #include "apr_general.h" #include "apr_strings.h" diff --git a/poll/os2/poll.c b/poll/os2/poll.c index 2e4136d18..ed36dc887 100755 --- a/poll/os2/poll.c +++ b/poll/os2/poll.c @@ -54,7 +54,7 @@ #include "apr.h" #include "apr_poll.h" -#include "networkio.h" +#include "apr_arch_networkio.h" APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t num, apr_int32_t *nsds, apr_interval_time_t timeout) diff --git a/poll/os2/pollset.c b/poll/os2/pollset.c index c8fb6aaec..fd665e5c6 100644 --- a/poll/os2/pollset.c +++ b/poll/os2/pollset.c @@ -54,7 +54,7 @@ #include "apr.h" #include "apr_poll.h" -#include "networkio.h" +#include "apr_arch_networkio.h" diff --git a/poll/unix/poll.c b/poll/unix/poll.c index a0aeaca36..516bd6c4c 100644 --- a/poll/unix/poll.c +++ b/poll/unix/poll.c @@ -56,8 +56,8 @@ #include "apr_poll.h" #include "apr_time.h" #include "apr_portable.h" -#include "networkio.h" -#include "fileio.h" +#include "apr_arch_networkio.h" +#include "apr_arch_fileio.h" #if HAVE_POLL_H #include <poll.h> #endif diff --git a/poll/unix/pollacc.c b/poll/unix/pollacc.c index d62d76e72..a2e73759b 100644 --- a/poll/unix/pollacc.c +++ b/poll/unix/pollacc.c @@ -54,8 +54,8 @@ #include "apr.h" #include "apr_poll.h" -#include "networkio.h" -#include "fileio.h" +#include "apr_arch_networkio.h" +#include "apr_arch_fileio.h" #if HAVE_POLL_H #include <poll.h> #endif diff --git a/shmem/unix/shm.c b/shmem/unix/shm.c index 740c4e682..dc1e9aad2 100644 --- a/shmem/unix/shm.c +++ b/shmem/unix/shm.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "shm.h" +#include "apr_arch_shm.h" #include "apr_general.h" #include "apr_errno.h" diff --git a/shmem/win32/shm.c b/shmem/win32/shm.c index 9fc5151b6..7451a6cf1 100644 --- a/shmem/win32/shm.c +++ b/shmem/win32/shm.c @@ -56,7 +56,7 @@ #include "apr_errno.h" #include "apr_file_io.h" #include "apr_shm.h" -#include "fileio.h" +#include "apr_arch_fileio.h" typedef struct memblock_t { apr_size_t size; diff --git a/support/unix/waitio.c b/support/unix/waitio.c index 716db0d70..d5d9985ca 100644 --- a/support/unix/waitio.c +++ b/support/unix/waitio.c @@ -52,8 +52,8 @@ * <http://www.apache.org/>. */ -#include "fileio.h" -#include "networkio.h" +#include "apr_arch_fileio.h" +#include "apr_arch_networkio.h" #include "apr_poll.h" #include "apr_errno.h" #include "apr_support.h" diff --git a/test/internal/testucs.c b/test/internal/testucs.c index a09dabf76..ffe256260 100644 --- a/test/internal/testucs.c +++ b/test/internal/testucs.c @@ -53,7 +53,7 @@ */ #include "apr.h" -#include "arch/win32/utf8.h" +#include "arch/win32/apr_arch_utf8.h" #include <wchar.h> #include <string.h> diff --git a/threadproc/beos/proc.c b/threadproc/beos/proc.c index 3b162a980..e97085581 100644 --- a/threadproc/beos/proc.c +++ b/threadproc/beos/proc.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" #include "apr_strings.h" struct send_pipe { diff --git a/threadproc/beos/thread.c b/threadproc/beos/thread.c index 37d851690..559233d8d 100644 --- a/threadproc/beos/thread.c +++ b/threadproc/beos/thread.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" #include "apr_portable.h" APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool) diff --git a/threadproc/beos/threadpriv.c b/threadproc/beos/threadpriv.c index ed1ea3e19..0c89688ef 100644 --- a/threadproc/beos/threadpriv.c +++ b/threadproc/beos/threadpriv.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" static struct beos_key key_table[BEOS_MAX_DATAKEYS]; static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS]; diff --git a/threadproc/netware/proc.c b/threadproc/netware/proc.c index c0df971c9..849637b5a 100644 --- a/threadproc/netware/proc.c +++ b/threadproc/netware/proc.c @@ -52,8 +52,8 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" -#include "fileio.h" +#include "apr_arch_threadproc.h" +#include "apr_arch_fileio.h" #include "apr_strings.h" #include "apr_portable.h" diff --git a/threadproc/netware/procsup.c b/threadproc/netware/procsup.c index dce6d6305..7e88633da 100644 --- a/threadproc/netware/procsup.c +++ b/threadproc/netware/procsup.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" apr_status_t apr_proc_detach(int daemonize) { diff --git a/threadproc/netware/signals.c b/threadproc/netware/signals.c index 03b8d620b..aacd96e35 100644 --- a/threadproc/netware/signals.c +++ b/threadproc/netware/signals.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" #include <nks/thread.h> #include "apr_private.h" #include "apr_pools.h" diff --git a/threadproc/netware/thread.c b/threadproc/netware/thread.c index 829639b42..192ad4055 100644 --- a/threadproc/netware/thread.c +++ b/threadproc/netware/thread.c @@ -55,7 +55,7 @@ #include "apr.h" #include "apr_portable.h" #include "apr_strings.h" -#include "threadproc.h" +#include "apr_arch_threadproc.h" static int thread_count = 0; diff --git a/threadproc/netware/threadpriv.c b/threadproc/netware/threadpriv.c index 10851afe4..e78b1c971 100644 --- a/threadproc/netware/threadpriv.c +++ b/threadproc/netware/threadpriv.c @@ -53,7 +53,7 @@ */ #include "apr_portable.h" -#include "threadproc.h" +#include "apr_arch_threadproc.h" apr_status_t apr_threadkey_private_create(apr_threadkey_t **key, void (*dest)(void *), apr_pool_t *pool) diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c index b0e4dc15f..86aec468d 100644 --- a/threadproc/os2/proc.c +++ b/threadproc/os2/proc.c @@ -55,8 +55,8 @@ #define INCL_DOS #define INCL_DOSERRORS -#include "threadproc.h" -#include "fileio.h" +#include "apr_arch_threadproc.h" +#include "apr_arch_fileio.h" #include "apr_private.h" #include "apr_thread_proc.h" #include "apr_file_io.h" diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c index 4dc5d4706..fe13ac0f2 100644 --- a/threadproc/os2/thread.c +++ b/threadproc/os2/thread.c @@ -54,12 +54,12 @@ #define INCL_DOSERRORS #define INCL_DOS -#include "threadproc.h" +#include "apr_arch_threadproc.h" #include "apr_thread_proc.h" #include "apr_general.h" #include "apr_lib.h" #include "apr_portable.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #include <stdlib.h> APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool) diff --git a/threadproc/os2/threadpriv.c b/threadproc/os2/threadpriv.c index 8fe99032e..1e8cfe14e 100644 --- a/threadproc/os2/threadpriv.c +++ b/threadproc/os2/threadpriv.c @@ -52,13 +52,13 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" #include "apr_thread_proc.h" #include "apr_portable.h" #include "apr_general.h" #include "apr_errno.h" #include "apr_lib.h" -#include "fileio.h" +#include "apr_arch_fileio.h" APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key, void (*dest)(void *), diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c index d534171cf..755221f19 100644 --- a/threadproc/unix/proc.c +++ b/threadproc/unix/proc.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" #include "apr_strings.h" #include "apr_portable.h" #include "apr_signal.h" diff --git a/threadproc/unix/procsup.c b/threadproc/unix/procsup.c index d0a5df28b..a1d2a1c4c 100644 --- a/threadproc/unix/procsup.c +++ b/threadproc/unix/procsup.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" APR_DECLARE(apr_status_t) apr_proc_detach(int daemonize) { diff --git a/threadproc/unix/signals.c b/threadproc/unix/signals.c index c31e30131..af22651fb 100644 --- a/threadproc/unix/signals.c +++ b/threadproc/unix/signals.c @@ -53,7 +53,7 @@ */ #define INCL_DOSEXCEPTIONS /* for OS2 */ -#include "threadproc.h" +#include "apr_arch_threadproc.h" #include "apr_private.h" #include "apr_pools.h" #include "apr_signal.h" diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c index 8852c3be6..062b3e930 100644 --- a/threadproc/unix/thread.c +++ b/threadproc/unix/thread.c @@ -54,7 +54,7 @@ #include "apr.h" #include "apr_portable.h" -#include "threadproc.h" +#include "apr_arch_threadproc.h" #if APR_HAS_THREADS diff --git a/threadproc/unix/threadpriv.c b/threadproc/unix/threadpriv.c index af693477d..4416c7a40 100644 --- a/threadproc/unix/threadpriv.c +++ b/threadproc/unix/threadpriv.c @@ -54,7 +54,7 @@ #include "apr.h" #include "apr_portable.h" -#include "threadproc.h" +#include "apr_arch_threadproc.h" #if APR_HAS_THREADS diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c index 5020c4567..21392ce14 100644 --- a/threadproc/win32/proc.c +++ b/threadproc/win32/proc.c @@ -52,8 +52,8 @@ * <http://www.apache.org/>. */ -#include "win32/threadproc.h" -#include "win32/fileio.h" +#include "win32/apr_arch_threadproc.h" +#include "win32/apr_arch_fileio.h" #include "apr_thread_proc.h" #include "apr_file_io.h" diff --git a/threadproc/win32/signals.c b/threadproc/win32/signals.c index 361413e4f..54c45f4e5 100644 --- a/threadproc/win32/signals.c +++ b/threadproc/win32/signals.c @@ -52,8 +52,8 @@ * <http://www.apache.org/>. */ -#include "win32/threadproc.h" -#include "win32/fileio.h" +#include "win32/apr_arch_threadproc.h" +#include "win32/apr_arch_fileio.h" #include "apr_thread_proc.h" #include "apr_file_io.h" #include "apr_general.h" diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c index c0606afd2..7d48228da 100644 --- a/threadproc/win32/thread.c +++ b/threadproc/win32/thread.c @@ -53,7 +53,7 @@ */ #include "apr_private.h" -#include "win32/threadproc.h" +#include "win32/apr_arch_threadproc.h" #include "apr_thread_proc.h" #include "apr_general.h" #include "apr_lib.h" @@ -61,7 +61,7 @@ #if APR_HAVE_PROCESS_H #include <process.h> #endif -#include "misc.h" +#include "apr_arch_misc.h" /* Chosen for us by apr_initialize */ DWORD tls_apr_thread = 0; diff --git a/threadproc/win32/threadpriv.c b/threadproc/win32/threadpriv.c index d016657f6..e2ae89c1f 100644 --- a/threadproc/win32/threadpriv.c +++ b/threadproc/win32/threadpriv.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "win32/threadproc.h" +#include "win32/apr_arch_threadproc.h" #include "apr_thread_proc.h" #include "apr_general.h" #include "apr_lib.h" diff --git a/time/unix/time.c b/time/unix/time.c index 48956096f..949b9ff2d 100644 --- a/time/unix/time.c +++ b/time/unix/time.c @@ -59,7 +59,7 @@ #include "apr_strings.h" /* private APR headers */ -#include "internal_time.h" +#include "apr_arch_internal_time.h" /* System Headers required for time library */ #if APR_HAVE_SYS_TIME_H diff --git a/time/win32/access.c b/time/win32/access.c index 168a06d73..6d48b836c 100644 --- a/time/win32/access.c +++ b/time/win32/access.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "win32/atime.h" +#include "win32/apr_arch_atime.h" #include "apr_time.h" #include "apr_general.h" #include "apr_lib.h" diff --git a/time/win32/time.c b/time/win32/time.c index bb888b865..8917297a4 100644 --- a/time/win32/time.c +++ b/time/win32/time.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "win32/atime.h" +#include "win32/apr_arch_atime.h" #include "apr_time.h" #include "apr_general.h" #include "apr_lib.h" @@ -65,7 +65,7 @@ #endif #include <string.h> #include <winbase.h> -#include "misc.h" +#include "apr_arch_misc.h" /* Leap year is any year divisible by four, but not by 100 unless also * divisible by 400 diff --git a/time/win32/timestr.c b/time/win32/timestr.c index 9e8d4debd..513418357 100644 --- a/time/win32/timestr.c +++ b/time/win32/timestr.c @@ -52,7 +52,7 @@ * <http://www.apache.org/>. */ -#include "win32/atime.h" +#include "win32/apr_arch_atime.h" #include "apr_portable.h" #include "apr_strings.h" diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c index 05faf3255..eea131210 100644 --- a/user/win32/userinfo.c +++ b/user/win32/userinfo.c @@ -56,7 +56,7 @@ #include "apr_strings.h" #include "apr_portable.h" #include "apr_user.h" -#include "fileio.h" +#include "apr_arch_fileio.h" #if APR_HAVE_SYS_TYPES_H #include <sys/types.h> #endif |