thommay 2003/01/06 16:06:29
Modified: include/arch/beos apr_arch_threadproc.h
include/arch/netware apr_arch_networkio.h
include/arch/os2 apr_arch_networkio.h
include/arch/unix apr_arch_global_mutex.h
apr_arch_proc_mutex.h apr_arch_threadproc.h
include/arch/win32 apr_arch_fileio.h
Log:
Finish off the rename of include/arch
Revision Changes Path
1.2 +1 -1 apr/include/arch/beos/apr_arch_threadproc.h
Index: apr_arch_threadproc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/beos/apr_arch_threadproc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_threadproc.h 6 Jan 2003 23:44:22 -0000 1.1
+++ apr_arch_threadproc.h 7 Jan 2003 00:06:28 -0000 1.2
@@ -53,7 +53,7 @@
*/
#include "apr_thread_proc.h"
-#include "fileio.h"
+#include "apr_arch_fileio.h"
#include "apr_file_io.h"
#include "apr_thread_proc.h"
#include "apr_general.h"
1.2 +1 -1 apr/include/arch/netware/apr_arch_networkio.h
Index: apr_arch_networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/netware/apr_arch_networkio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_networkio.h 6 Jan 2003 23:44:23 -0000 1.1
+++ apr_arch_networkio.h 7 Jan 2003 00:06:28 -0000 1.2
@@ -59,7 +59,7 @@
arch/netware and then arch/unix. But in this specific case we
want arch/win32.
*/
-#include <../win32/networkio.h>
+#include <../win32/apr_arch_networkio.h>
#endif /* ! NETWORK_IO_H */
1.2 +1 -1 apr/include/arch/os2/apr_arch_networkio.h
Index: apr_arch_networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/os2/apr_arch_networkio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_networkio.h 6 Jan 2003 23:44:25 -0000 1.1
+++ apr_arch_networkio.h 7 Jan 2003 00:06:28 -0000 1.2
@@ -58,7 +58,7 @@
#include "apr_private.h"
#include "apr_network_io.h"
#include "apr_general.h"
-#include "os2calls.h"
+#include "apr_arch_os2calls.h"
#if APR_HAVE_NETDB_H
#include <netdb.h>
#endif
1.2 +2 -2 apr/include/arch/unix/apr_arch_global_mutex.h
Index: apr_arch_global_mutex.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/apr_arch_global_mutex.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_global_mutex.h 6 Jan 2003 23:44:26 -0000 1.1
+++ apr_arch_global_mutex.h 7 Jan 2003 00:06:29 -0000 1.2
@@ -60,8 +60,8 @@
#include "apr_general.h"
#include "apr_lib.h"
#include "apr_global_mutex.h"
-#include "proc_mutex.h"
-#include "thread_mutex.h"
+#include "apr_arch_proc_mutex.h"
+#include "apr_arch_thread_mutex.h"
struct apr_global_mutex_t {
apr_pool_t *pool;
1.2 +1 -1 apr/include/arch/unix/apr_arch_proc_mutex.h
Index: apr_arch_proc_mutex.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/apr_arch_proc_mutex.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_proc_mutex.h 6 Jan 2003 23:44:26 -0000 1.1
+++ apr_arch_proc_mutex.h 7 Jan 2003 00:06:29 -0000 1.2
@@ -63,7 +63,7 @@
#include "apr_pools.h"
#include "apr_portable.h"
#include "apr_file_io.h"
-#include "fileio.h"
+#include "apr_arch_fileio.h"
/* System headers required by Locks library */
#if APR_HAVE_SYS_TYPES_H
1.2 +1 -1 apr/include/arch/unix/apr_arch_threadproc.h
Index: apr_arch_threadproc.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/apr_arch_threadproc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_threadproc.h 6 Jan 2003 23:44:26 -0000 1.1
+++ apr_arch_threadproc.h 7 Jan 2003 00:06:29 -0000 1.2
@@ -56,7 +56,7 @@
#include "apr_private.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
-#include "fileio.h"
+#include "apr_arch_fileio.h"
/* System headers required for thread/process library */
#if APR_HAVE_PTHREAD_H
1.2 +2 -2 apr/include/arch/win32/apr_arch_fileio.h
Index: apr_arch_fileio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/apr_arch_fileio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_arch_fileio.h 6 Jan 2003 23:44:27 -0000 1.1
+++ apr_arch_fileio.h 7 Jan 2003 00:06:29 -0000 1.2
@@ -64,7 +64,7 @@
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_errno.h"
-#include "misc.h"
+#include "apr_arch_misc.h"
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -86,7 +86,7 @@
#endif
#if APR_HAS_UNICODE_FS
-#include "arch/win32/utf8.h"
+#include "arch/win32/apr_arch_utf8.h"
#include <wchar.h>
typedef apr_uint16_t apr_wchar_t;
