Fix up Win32-private includes to bring it in line with all other platforms.

Originally titled: [patch 10/17] include path prefix win32/

Submitted by: John Mark Vandenberg
Reviewed by: Will Rowe (concept), Justin Erenkrantz


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@421349 13f79535-47bb-0310-9956-ffa450edef68

14 files changed, 18 insertions, 18 deletions

diff --git a/file_io/win32/buffer.c b/file_io/win32/buffer.c
index e4ff676f7..2e56b9933 100644
--- a/file_io/win32/buffer.c
+++ b/file_io/win32/buffer.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_thread_mutex.h"
 
 APR_DECLARE(apr_status_t) apr_file_buffer_set(apr_file_t *file, 
@@ -56,4 +56,4 @@ APR_DECLARE(apr_status_t) apr_file_buffer_set(apr_file_t *file,
 APR_DECLARE(apr_size_t) apr_file_buffer_size_get(apr_file_t *file)
 {
     return file->bufsize;
-}
\ No newline at end of file
+}
diff --git a/file_io/win32/filedup.c b/file_io/win32/filedup.c
index 9cac74d47..e576d85ba 100644
--- a/file_io/win32/filedup.c
+++ b/file_io/win32/filedup.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/pipe.c b/file_io/win32/pipe.c
index 1e940f20e..a080770d5 100644
--- a/file_io/win32/pipe.c
+++ b/file_io/win32/pipe.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c
index ea85aae4b..2f8ba9ece 100644
--- a/file_io/win32/readwrite.c
+++ b/file_io/win32/readwrite.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
diff --git a/file_io/win32/seek.c b/file_io/win32/seek.c
index dc25037c6..a9ac5f5d9 100644
--- a/file_io/win32/seek.c
+++ b/file_io/win32/seek.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include <errno.h>
 #include <string.h>
diff --git a/locks/win32/thread_cond.c b/locks/win32/thread_cond.c
index 483f3300e..8e8b5b524 100644
--- a/locks/win32/thread_cond.c
+++ b/locks/win32/thread_cond.c
@@ -18,8 +18,8 @@
 #include "apr_private.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "win32/apr_arch_thread_mutex.h"
-#include "win32/apr_arch_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/win32/thread_rwlock.c b/locks/win32/thread_rwlock.c
index 9207d7929..2e4ec62b8 100644
--- a/locks/win32/thread_rwlock.c
+++ b/locks/win32/thread_rwlock.c
@@ -18,7 +18,7 @@
 #include "apr_private.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "win32/apr_arch_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/threadproc/win32/proc.c b/threadproc/win32/proc.c
index 63d7e9cc5..49290735a 100644
--- a/threadproc/win32/proc.c
+++ b/threadproc/win32/proc.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_threadproc.h"
+#include "apr_arch_file_io.h"
 
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
diff --git a/threadproc/win32/signals.c b/threadproc/win32/signals.c
index d4d8a6402..a51cf7e25 100644
--- a/threadproc/win32/signals.c
+++ b/threadproc/win32/signals.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_threadproc.h"
+#include "apr_arch_file_io.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 09c53c3eb..61e5d8084 100644
--- a/threadproc/win32/thread.c
+++ b/threadproc/win32/thread.c
@@ -15,7 +15,7 @@
  */
 
 #include "apr_private.h"
-#include "win32/apr_arch_threadproc.h"
+#include "apr_arch_threadproc.h"
 #include "apr_thread_proc.h"
 #include "apr_general.h"
 #include "apr_lib.h"
diff --git a/threadproc/win32/threadpriv.c b/threadproc/win32/threadpriv.c
index 0d45b0da2..d99a3e9b6 100644
--- a/threadproc/win32/threadpriv.c
+++ b/threadproc/win32/threadpriv.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_threadproc.h"
+#include "apr_arch_threadproc.h"
 #include "apr_thread_proc.h"
 #include "apr_general.h"
 #include "apr_lib.h"
diff --git a/time/win32/access.c b/time/win32/access.c
index e746fca1f..a4c96efd1 100644
--- a/time/win32/access.c
+++ b/time/win32/access.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_atime.h"
+#include "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 89d6d5e40..3209f470a 100644
--- a/time/win32/time.c
+++ b/time/win32/time.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_atime.h"
+#include "apr_arch_atime.h"
 #include "apr_time.h"
 #include "apr_general.h"
 #include "apr_lib.h"
diff --git a/time/win32/timestr.c b/time/win32/timestr.c
index ce96c867e..a533a0aea 100644
--- a/time/win32/timestr.c
+++ b/time/win32/timestr.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_atime.h"
+#include "apr_arch_atime.h"
 #include "apr_portable.h"
 #include "apr_strings.h"