From 33ab61668c6b6d23ecf98b76839fe5c941fa10e5 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Thu, 1 Aug 2019 13:58:45 +0000 Subject: [PATCH] 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 --- modules/md/mod_md.c | 4 ---- modules/md/mod_md_os.c | 7 ------- 2 files changed, 11 deletions(-) diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c index d1f4f4b3c0..23ad12ee2f 100644 --- a/modules/md/mod_md.c +++ b/modules/md/mod_md.c @@ -18,10 +18,6 @@ #include #include -#include -#ifndef AP_ENABLE_EXCEPTION_HOOK -#define AP_ENABLE_EXCEPTION_HOOK 0 -#endif #include #include #include diff --git a/modules/md/mod_md_os.c b/modules/md/mod_md_os.c index 6544e9ae12..1291863d15 100644 --- a/modules/md/mod_md_os.c +++ b/modules/md/mod_md_os.c @@ -17,13 +17,6 @@ #include #include -#include -#if !AP_MODULE_MAGIC_AT_LEAST(20180720, 5) -#ifndef AP_ENABLE_EXCEPTION_HOOK -#define AP_ENABLE_EXCEPTION_HOOK 0 -#endif -#endif - #include #include #include -- 2.50.1