[patch 10/17] include path prefix win32/

[John Mark Vandenberg <ja...@gmail.com>]

The current autotools build system does not add 'include/arch' to
the include path, so the includes in the form 'win32/...' dont
work.

The build system could be enhanced, but this brings win32 into line
with the other platforms.

Index: file_io/win32/buffer.c
===================================================================
--- file_io/win32/buffer.c.orig
+++ 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_buffe
 APR_DECLARE(apr_size_t) apr_file_buffer_size_get(apr_file_t *file)
 {
     return file->bufsize;
-}
\ No newline at end of file
+}
Index: file_io/win32/filedup.c
===================================================================
--- file_io/win32/filedup.c.orig
+++ 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"
Index: file_io/win32/pipe.c
===================================================================
--- file_io/win32/pipe.c.orig
+++ 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"
Index: file_io/win32/readwrite.c
===================================================================
--- file_io/win32/readwrite.c.orig
+++ 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"
Index: file_io/win32/seek.c
===================================================================
--- file_io/win32/seek.c.orig
+++ 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>
Index: locks/win32/thread_cond.c
===================================================================
--- locks/win32/thread_cond.c.orig
+++ 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)
Index: locks/win32/thread_rwlock.c
===================================================================
--- locks/win32/thread_rwlock.c.orig
+++ 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)
Index: threadproc/win32/proc.c
===================================================================
--- threadproc/win32/proc.c.orig
+++ 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"
Index: threadproc/win32/signals.c
===================================================================
--- threadproc/win32/signals.c.orig
+++ 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"
Index: threadproc/win32/thread.c
===================================================================
--- threadproc/win32/thread.c.orig
+++ 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"
Index: threadproc/win32/threadpriv.c
===================================================================
--- threadproc/win32/threadpriv.c.orig
+++ 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"
Index: time/win32/access.c
===================================================================
--- time/win32/access.c.orig
+++ 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"
Index: time/win32/time.c
===================================================================
--- time/win32/time.c.orig
+++ 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"
Index: time/win32/timestr.c
===================================================================
--- time/win32/timestr.c.orig
+++ 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"
 

--

Re: [patch 10/17] include path prefix win32/

["William A. Rowe, Jr." <wr...@rowe-clan.net>]

John Mark Vandenberg wrote:
> The current autotools build system does not add 'include/arch' to
> the include path, so the includes in the form 'win32/...' dont
> work.
> 
> The build system could be enhanced, but this brings win32 into line
> with the other platforms.

Agreed, the old semantics are a problem.

Re: [patch 10/17] include path prefix win32/

[Justin Erenkrantz <ju...@erenkrantz.com>]

On 4/14/06, John Mark Vandenberg <ja...@gmail.com> wrote:
> The current autotools build system does not add 'include/arch' to
> the include path, so the includes in the form 'win32/...' dont
> work.
>
> The build system could be enhanced, but this brings win32 into line
> with the other platforms.

Committed in r421349.  Thanks!  -- justin