Commit 97f9feee authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1706595 from trunk: 

Follow-up to r1702948:

APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
defined, to either 0 or 1)

This fixes a compile error on Windows introduced by r1702948
as well as straightens up two long-time glitches.


Submitted by: trawick
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1774626 13f79535-47bb-0310-9956-ffa450edef68
parent 2f9bc77e

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -118,13 +118,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) APR_HAVE_foo is checked via #if, not #ifdef (since it should always be

     defined, to either 0 or 1).

     This fixes a compile error on Windows introduced by r1702948.

     as well as straightens up two long-time glitches.

     trunk patch: http://svn.apache.org/r1706595

     2.4.x patch: trunk works

     +1: rjung, jim, ylavic





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

include/scoreboard.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
extern "C" {

#endif



#ifdef APR_HAVE_SYS_TIME_H

#if APR_HAVE_SYS_TIME_H

#include <sys/time.h>

#include <sys/times.h>

#endif

modules/filters/regexp.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


#include "apr.h"

#include "apr_lib.h"

#ifdef APR_HAVE_LIMITS_H

#if APR_HAVE_LIMITS_H

#include <limits.h>

#endif

#if APR_HAVE_STDLIB_H

modules/ssl/ssl_private.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
/* The #ifdef macros are only defined AFTER including the above

 * therefore we cannot include these system files at the top  :-(

 */

#ifdef APR_HAVE_STDLIB_H

#if APR_HAVE_STDLIB_H

#include <stdlib.h>

#endif

#if APR_HAVE_SYS_TIME_H