don't mess with AP_ENABLE_EXCEPTION_HOOK on trunk

mpm_common defines it later anyway:

In file included from mod_md.c:25:
In file included from /Users/covener/SRC/httpd-trunk/include/mpm_common.h:40:
In file included from /Users/covener/SRC/httpd-trunk/include/ap_config.h:184:
/Users/covener/SRC/httpd-trunk/include/ap_config_auto.h:11:9: error: 'AP_ENABLE_EXCEPTION_HOOK' macro redefined [-Werror,-Wmacro-redefined]

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

diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c
index d1f4f4b3c014be95aa5070c75f9eb84832a406ab..23ad12ee2fe5cb8fc1ab17dc275b05744c5b5d12 100644 (file)
--- a/modules/md/mod_md.c
+++ b/modules/md/mod_md.c
@@ -18,10 +18,6 @@
 #include <apr_optional.h>
 #include <apr_strings.h>
 
-#include <ap_release.h>
-#ifndef AP_ENABLE_EXCEPTION_HOOK
-#define AP_ENABLE_EXCEPTION_HOOK 0
-#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 6544e9ae127c1e566d4756037c207e7a26b99ccb..1291863d1539fadff389f0b4905872450306ac49 100644 (file)
--- a/modules/md/mod_md_os.c
+++ b/modules/md/mod_md_os.c
@@ -17,13 +17,6 @@
 #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>
 #include <http_log.h>