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

21 files changed, 34 insertions, 34 deletions

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)