Merge 1293534, 1293535:

Fix compiler warnings with C89
Submitted by: Daniel Shahaf <danielsh elego de>

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

diff --git a/STATUS b/STATUS
index b25db5ce9a7d854d2327f7cc79eb0b0b4b20676d..c2455fa65d284675fe00e45b787eb857f6d056e7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,18 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * Fix another compiler warning
-    Submitted by: Daniel Shahaf <danielsh elego de>
-    Trunk patches: http://svn.apache.org/viewvc?view=revision&revision=1293535
-    2.4.x patch: Trunk patch works
-    +1: minfrin, sf, trawick
-
-  * Fix compiler warning
-    Submitted by: Daniel Shahaf <danielsh elego de>
-    Trunk patches: http://svn.apache.org/viewvc?view=revision&revision=1293534
-    2.4.x patch: Trunk patch works
-    +1: sf, minfrin, trawick
-
   * Add AP_HAVE_C99 to make correct check for C99 less onerous
     Using __STDC_VERSION__ without checking if it is defined causes warnings
     on C89.

diff --git a/include/ap_config.h b/include/ap_config.h
index 7c6a795b05c45e909ca13e7df726b6f796f2f29e..b65b75157b5b263ccf561b9afe9fdcba1d3ff55c 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -148,7 +148,7 @@
 #define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
 #endif
 
-#if AP_ENABLE_DTRACE && HAVE_SYS_SDT_H
+#if defined(AP_ENABLE_DTRACE) && HAVE_SYS_SDT_H
 #include <sys/sdt.h>
 #else
 #undef _DTRACE_VERSION

diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index b061c0a23b87f682eff7b80e953bd0ed60596b55..71f8f47caa23d8630e34d807ee71eefebda49653 100644 (file)
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -218,7 +218,7 @@ extern void moncontrol(int);
 #define AP_MONCONTROL(x)
 #endif
 
-#if AP_ENABLE_EXCEPTION_HOOK
+#ifdef AP_ENABLE_EXCEPTION_HOOK
 typedef struct ap_exception_info_t {
     int sig;
     pid_t pid;