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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706595 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/scoreboard.h b/include/scoreboard.h
index f5cf939de7b2a6b83bfeb1da9225056ec8df7ba8..5200c30a5d6e9f90d3edfba037864eae8aa1f0c2 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -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

diff --git a/modules/filters/regexp.c b/modules/filters/regexp.c
index ba118a6552d45af30bd4f7c9c979e3288876ca5b..4acccca6765338cc0ce8892af0fbec9eea46f178 100644 (file)
--- a/modules/filters/regexp.c
+++ b/modules/filters/regexp.c
@@ -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

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index bc822235cfdd852c75b384d8d9aaccae5adbbd18..cfdabd78f3706213c7a43a68292d5ac603bcb56e 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -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