Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 88666 invoked from network); 29 Mar 2011 19:30:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Mar 2011 19:30:44 -0000 Received: (qmail 93668 invoked by uid 500); 29 Mar 2011 19:30:44 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 93633 invoked by uid 500); 29 Mar 2011 19:30:44 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 93626 invoked by uid 99); 29 Mar 2011 19:30:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Mar 2011 19:30:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Mar 2011 19:30:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 30CA123888FD; Tue, 29 Mar 2011 19:30:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 29 Mar 2011 19:30:23 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110329193023.30CA123888FD@eris.apache.org> 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 #endif -#if HAVE_SCHED_H +#ifdef HAVE_SCHED_H #include #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