Skip to content

Commit 7d3b6f9

Browse files
committed
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
1 parent 691ae77 commit 7d3b6f9

2 files changed

Lines changed: 0 additions & 11 deletions

File tree

‎modules/md/mod_md.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
#include <apr_optional.h>
1919
#include <apr_strings.h>
2020

21-
#include <ap_release.h>
22-
#ifndef AP_ENABLE_EXCEPTION_HOOK
23-
#define AP_ENABLE_EXCEPTION_HOOK 0
24-
#endif
2521
#include <mpm_common.h>
2622
#include <httpd.h>
2723
#include <http_core.h>

‎modules/md/mod_md_os.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717
#include <assert.h>
1818
#include <apr_strings.h>
1919

20-
#include <ap_mmn.h>
21-
#if !AP_MODULE_MAGIC_AT_LEAST(20180720, 5)
22-
#ifndef AP_ENABLE_EXCEPTION_HOOK
23-
#define AP_ENABLE_EXCEPTION_HOOK 0
24-
#endif
25-
#endif
26-
2720
#include <mpm_common.h>
2821
#include <httpd.h>
2922
#include <http_log.h>

0 commit comments

Comments
 (0)