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

15 files changed, 22 insertions, 22 deletions

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"