You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2011/03/29 21:30:23 UTC
svn commit: r1086695 - in /apr/apr/trunk: configure.in file_io/unix/pipe.c
file_io/unix/readwrite.c include/arch/unix/apr_arch_threadproc.h
support/unix/waitio.c
Author: trawick
Date: Tue Mar 29 19:30:22 2011
New Revision: 1086695
URL: http://svn.apache.org/viewvc?rev=1086695&view=rev
Log:
fix a bit of 'if FOO'/'ifdef FOO' confusion
Modified:
apr/apr/trunk/configure.in
apr/apr/trunk/file_io/unix/pipe.c
apr/apr/trunk/file_io/unix/readwrite.c
apr/apr/trunk/include/arch/unix/apr_arch_threadproc.h
apr/apr/trunk/support/unix/waitio.c
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1086695&r1=1086694&r2=1086695&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Mar 29 19:30:22 2011
@@ -49,7 +49,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/trunk/file_io/unix/pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/unix/pipe.c?rev=1086695&r1=1086694&r2=1086695&view=diff
==============================================================================
--- apr/apr/trunk/file_io/unix/pipe.c (original)
+++ apr/apr/trunk/file_io/unix/pipe.c Tue Mar 29 19:30:22 2011
@@ -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/trunk/file_io/unix/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/unix/readwrite.c?rev=1086695&r1=1086694&r2=1086695&view=diff
==============================================================================
--- apr/apr/trunk/file_io/unix/readwrite.c (original)
+++ apr/apr/trunk/file_io/unix/readwrite.c Tue Mar 29 19:30:22 2011
@@ -23,7 +23,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/trunk/include/arch/unix/apr_arch_threadproc.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/unix/apr_arch_threadproc.h?rev=1086695&r1=1086694&r2=1086695&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/unix/apr_arch_threadproc.h (original)
+++ apr/apr/trunk/include/arch/unix/apr_arch_threadproc.h Tue Mar 29 19:30:22 2011
@@ -40,7 +40,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/trunk/support/unix/waitio.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/support/unix/waitio.c?rev=1086695&r1=1086694&r2=1086695&view=diff
==============================================================================
--- apr/apr/trunk/support/unix/waitio.c (original)
+++ apr/apr/trunk/support/unix/waitio.c Tue Mar 29 19:30:22 2011
@@ -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 && !defined(OS2) && APR_FILES_AS_SOCKETS
+#if !defined(BEOS_R5) && !defined(OS2) && APR_FILES_AS_SOCKETS
#define USE_WAIT_FOR_IO
#endif