apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1528889 - in /apr/apr/branches/1.5.x: ./ configure.in file_io/unix/pipe.c file_io/unix/readwrite.c include/arch/unix/apr_arch_threadproc.h support/unix/waitio.c
Date Thu, 03 Oct 2013 14:30:18 GMT
Author: rjung
Date: Thu Oct  3 14:30:17 2013
New Revision: 1528889

URL: http://svn.apache.org/r1528889
Log:
fix compile failure with MinGW toolchain

PR: 46175 (this is but a small part of the patch)
Submitted by: Carlo Bramini
Reviewed by: trawick

Backport of r1083038 from trunk.

fix a bit of 'if FOO'/'ifdef FOO' confusion

Backport of r1086695 from trunk.

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/configure.in
    apr/apr/branches/1.5.x/file_io/unix/pipe.c
    apr/apr/branches/1.5.x/file_io/unix/readwrite.c
    apr/apr/branches/1.5.x/include/arch/unix/apr_arch_threadproc.h
    apr/apr/branches/1.5.x/support/unix/waitio.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1083038,1086695

Modified: apr/apr/branches/1.5.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/configure.in?rev=1528889&r1=1528888&r2=1528889&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/configure.in (original)
+++ apr/apr/branches/1.5.x/configure.in Thu Oct  3 14:30:17 2013
@@ -35,7 +35,7 @@ AH_TOP([
 dnl Hard-coded inclusion at the tail end of apr_private.h:
 AH_BOTTOM([
 /* switch this on if we have a BeOS version below BONE */
-#if BEOS && !HAVE_BONE_VERSION
+#if defined(BEOS) && !defined(HAVE_BONE_VERSION)
 #define BEOS_R5 1
 #else
 #define BEOS_BONE 1

Modified: apr/apr/branches/1.5.x/file_io/unix/pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/file_io/unix/pipe.c?rev=1528889&r1=1528888&r2=1528889&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/file_io/unix/pipe.c (original)
+++ apr/apr/branches/1.5.x/file_io/unix/pipe.c Thu Oct  3 14:30:17 2013
@@ -25,8 +25,8 @@
  * but now fcntl does, hence we need to do this extra checking.
  * The joys of beta programs. :-)
  */
-#if BEOS
-#if !BONE7
+#if defined(BEOS)
+#if !defined(BONE7)
 # define BEOS_BLOCKING 1
 #else
 # define BEOS_BLOCKING 0
@@ -35,7 +35,7 @@
 
 static apr_status_t pipeblock(apr_file_t *thepipe)
 {
-#if !BEOS_BLOCKING
+#if !defined(BEOS) || !BEOS_BLOCKING
       int fd_flags;
 
       fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
@@ -71,7 +71,7 @@ static apr_status_t pipeblock(apr_file_t
 
 static apr_status_t pipenonblock(apr_file_t *thepipe)
 {
-#if !BEOS_BLOCKING
+#if !defined(BEOS) || !BEOS_BLOCKING
       int fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
 
 #  if defined(O_NONBLOCK)

Modified: apr/apr/branches/1.5.x/file_io/unix/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/file_io/unix/readwrite.c?rev=1528889&r1=1528888&r2=1528889&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/file_io/unix/readwrite.c (original)
+++ apr/apr/branches/1.5.x/file_io/unix/readwrite.c Thu Oct  3 14:30:17 2013
@@ -21,7 +21,7 @@
 
 /* The only case where we don't use wait_for_io_or_timeout is on
  * pre-BONE BeOS, so this check should be sufficient and simpler */
-#if !BEOS_R5
+#if !defined(BEOS_R5)
 #define USE_WAIT_FOR_IO
 #endif
 

Modified: apr/apr/branches/1.5.x/include/arch/unix/apr_arch_threadproc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/arch/unix/apr_arch_threadproc.h?rev=1528889&r1=1528888&r2=1528889&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/arch/unix/apr_arch_threadproc.h (original)
+++ apr/apr/branches/1.5.x/include/arch/unix/apr_arch_threadproc.h Thu Oct  3 14:30:17 2013
@@ -39,7 +39,7 @@
 #if APR_HAVE_STRING_H
 #include <string.h>
 #endif
-#if HAVE_SCHED_H
+#ifdef HAVE_SCHED_H
 #include <sched.h>
 #endif
 /* End System Headers */

Modified: apr/apr/branches/1.5.x/support/unix/waitio.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/support/unix/waitio.c?rev=1528889&r1=1528888&r2=1528889&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/support/unix/waitio.c (original)
+++ apr/apr/branches/1.5.x/support/unix/waitio.c Thu Oct  3 14:30:17 2013
@@ -22,7 +22,7 @@
 
 /* The only case where we don't use wait_for_io_or_timeout is on
  * pre-BONE BeOS, so this check should be sufficient and simpler */
-#if !BEOS_R5
+#if !defined(BEOS_R5) && !defined(OS2) && APR_FILES_AS_SOCKETS
 #define USE_WAIT_FOR_IO
 #endif
 



Mime
View raw message