From: Eric Covener <covener@apache.org>
Date: Tue, 14 Aug 2018 21:25:54 +0000 (+0000)
Subject: don't use workaround on trunk
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2395
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a54f7fbbe641642f45edc2dbcd51ca748608ebd8;p=thirdparty%2Fapache%2Fhttpd.git

don't use workaround on trunk

it breaks the build w/ maintainer mode.


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

diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c
index 249a0f000e5..2f682835cd2 100644
--- a/modules/md/mod_md.c
+++ b/modules/md/mod_md.c
@@ -19,9 +19,12 @@
 #include <apr_strings.h>
 
 #include <ap_release.h>
+#include <ap_mmn.h>
+#if !AP_MODULE_MAGIC_AT_LEAST(20180720, 5)
 #ifndef AP_ENABLE_EXCEPTION_HOOK
 #define AP_ENABLE_EXCEPTION_HOOK 0
 #endif
+#endif
 #include <mpm_common.h>
 #include <httpd.h>
 #include <http_core.h>
diff --git a/modules/md/mod_md_os.c b/modules/md/mod_md_os.c
index f96d5667c0a..6f0b121e1ee 100644
--- a/modules/md/mod_md_os.c
+++ b/modules/md/mod_md_os.c
@@ -17,9 +17,12 @@
 #include <assert.h>
 #include <apr_strings.h>
 
+#include <ap_mmn.h>
+#if !AP_MODULE_MAGIC_AT_LEAST(20180720, 5)
 #ifndef AP_ENABLE_EXCEPTION_HOOK
 #define AP_ENABLE_EXCEPTION_HOOK 0
 #endif
+#endif
 
 #include <mpm_common.h>
 #include <httpd.h>