httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1706595 - in /httpd/httpd/trunk: include/scoreboard.h modules/filters/regexp.c modules/ssl/ssl_private.h
Date Sat, 03 Oct 2015 14:55:43 GMT
Author: trawick
Date: Sat Oct  3 14:55:43 2015
New Revision: 1706595

URL: http://svn.apache.org/viewvc?rev=1706595&view=rev
Log:
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.


Modified:
    httpd/httpd/trunk/include/scoreboard.h
    httpd/httpd/trunk/modules/filters/regexp.c
    httpd/httpd/trunk/modules/ssl/ssl_private.h

Modified: httpd/httpd/trunk/include/scoreboard.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/scoreboard.h?rev=1706595&r1=1706594&r2=1706595&view=diff
==============================================================================
--- httpd/httpd/trunk/include/scoreboard.h (original)
+++ httpd/httpd/trunk/include/scoreboard.h Sat Oct  3 14:55:43 2015
@@ -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

Modified: httpd/httpd/trunk/modules/filters/regexp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/regexp.c?rev=1706595&r1=1706594&r2=1706595&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/regexp.c (original)
+++ httpd/httpd/trunk/modules/filters/regexp.c Sat Oct  3 14:55:43 2015
@@ -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

Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1706595&r1=1706594&r2=1706595&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Sat Oct  3 14:55:43 2015
@@ -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



Mime
View raw message