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

20 files changed, 27 insertions, 27 deletions

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"