You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2006/07/12 19:52:34 UTC
svn commit: r421349 - in /apr/apr/trunk: file_io/win32/ locks/win32/
threadproc/win32/ time/win32/
Author: jerenkrantz
Date: Wed Jul 12 10:52:33 2006
New Revision: 421349
URL: http://svn.apache.org/viewvc?rev=421349&view=rev
Log:
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
Modified:
apr/apr/trunk/file_io/win32/buffer.c
apr/apr/trunk/file_io/win32/filedup.c
apr/apr/trunk/file_io/win32/pipe.c
apr/apr/trunk/file_io/win32/readwrite.c
apr/apr/trunk/file_io/win32/seek.c
apr/apr/trunk/locks/win32/thread_cond.c
apr/apr/trunk/locks/win32/thread_rwlock.c
apr/apr/trunk/threadproc/win32/proc.c
apr/apr/trunk/threadproc/win32/signals.c
apr/apr/trunk/threadproc/win32/thread.c
apr/apr/trunk/threadproc/win32/threadpriv.c
apr/apr/trunk/time/win32/access.c
apr/apr/trunk/time/win32/time.c
apr/apr/trunk/time/win32/timestr.c
Modified: apr/apr/trunk/file_io/win32/buffer.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/buffer.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/buffer.c (original)
+++ apr/apr/trunk/file_io/win32/buffer.c Wed Jul 12 10:52:33 2006
@@ -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_size_t) apr_file_buffer_size_get(apr_file_t *file)
{
return file->bufsize;
-}
\ No newline at end of file
+}
Modified: apr/apr/trunk/file_io/win32/filedup.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/filedup.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/filedup.c (original)
+++ apr/apr/trunk/file_io/win32/filedup.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/file_io/win32/pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/pipe.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/pipe.c (original)
+++ apr/apr/trunk/file_io/win32/pipe.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/readwrite.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/readwrite.c (original)
+++ apr/apr/trunk/file_io/win32/readwrite.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/file_io/win32/seek.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/seek.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/seek.c (original)
+++ apr/apr/trunk/file_io/win32/seek.c Wed Jul 12 10:52:33 2006
@@ -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>
Modified: apr/apr/trunk/locks/win32/thread_cond.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/win32/thread_cond.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/locks/win32/thread_cond.c (original)
+++ apr/apr/trunk/locks/win32/thread_cond.c Wed Jul 12 10:52:33 2006
@@ -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)
Modified: apr/apr/trunk/locks/win32/thread_rwlock.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/win32/thread_rwlock.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/locks/win32/thread_rwlock.c (original)
+++ apr/apr/trunk/locks/win32/thread_rwlock.c Wed Jul 12 10:52:33 2006
@@ -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)
Modified: apr/apr/trunk/threadproc/win32/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/threadproc/win32/proc.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/threadproc/win32/proc.c (original)
+++ apr/apr/trunk/threadproc/win32/proc.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/threadproc/win32/signals.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/threadproc/win32/signals.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/threadproc/win32/signals.c (original)
+++ apr/apr/trunk/threadproc/win32/signals.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/threadproc/win32/thread.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/threadproc/win32/thread.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/threadproc/win32/thread.c (original)
+++ apr/apr/trunk/threadproc/win32/thread.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/threadproc/win32/threadpriv.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/threadproc/win32/threadpriv.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/threadproc/win32/threadpriv.c (original)
+++ apr/apr/trunk/threadproc/win32/threadpriv.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/time/win32/access.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/time/win32/access.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/time/win32/access.c (original)
+++ apr/apr/trunk/time/win32/access.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/time/win32/time.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/time/win32/time.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/time/win32/time.c (original)
+++ apr/apr/trunk/time/win32/time.c Wed Jul 12 10:52:33 2006
@@ -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"
Modified: apr/apr/trunk/time/win32/timestr.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/time/win32/timestr.c?rev=421349&r1=421348&r2=421349&view=diff
==============================================================================
--- apr/apr/trunk/time/win32/timestr.c (original)
+++ apr/apr/trunk/time/win32/timestr.c Wed Jul 12 10:52:33 2006
@@ -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"