You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2018/08/14 21:25:54 UTC
svn commit: r1838054 - in /httpd/httpd/trunk/modules/md: mod_md.c mod_md_os.c
Author: covener
Date: Tue Aug 14 21:25:54 2018
New Revision: 1838054
URL: http://svn.apache.org/viewvc?rev=1838054&view=rev
Log:
don't use workaround on trunk
it breaks the build w/ maintainer mode.
Modified:
httpd/httpd/trunk/modules/md/mod_md.c
httpd/httpd/trunk/modules/md/mod_md_os.c
Modified: httpd/httpd/trunk/modules/md/mod_md.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md.c?rev=1838054&r1=1838053&r2=1838054&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/mod_md.c (original)
+++ httpd/httpd/trunk/modules/md/mod_md.c Tue Aug 14 21:25:54 2018
@@ -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>
Modified: httpd/httpd/trunk/modules/md/mod_md_os.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md_os.c?rev=1838054&r1=1838053&r2=1838054&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/mod_md_os.c (original)
+++ httpd/httpd/trunk/modules/md/mod_md_os.c Tue Aug 14 21:25:54 2018
@@ -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>
Re: svn commit: r1838054 - in /httpd/httpd/trunk/modules/md: mod_md.c mod_md_os.c
Posted by Eric Covener <co...@gmail.com>.
On Wed, Aug 15, 2018 at 4:26 AM stefan@eissing.org <st...@eissing.org> wrote:
>
> Under which conditions did it not build? I am using maintainer mode on MacOS all the time.
I was getting an error w/ maintainer mode enabled, about the re-definition.
Re: svn commit: r1838054 - in /httpd/httpd/trunk/modules/md: mod_md.c
mod_md_os.c
Posted by "stefan@eissing.org" <st...@eissing.org>.
Under which conditions did it not build? I am using maintainer mode on MacOS all the time.
> Am 14.08.2018 um 23:25 schrieb covener@apache.org:
>
> Author: covener
> Date: Tue Aug 14 21:25:54 2018
> New Revision: 1838054
>
> URL: http://svn.apache.org/viewvc?rev=1838054&view=rev
> Log:
> don't use workaround on trunk
>
> it breaks the build w/ maintainer mode.
>
> Modified:
> httpd/httpd/trunk/modules/md/mod_md.c
> httpd/httpd/trunk/modules/md/mod_md_os.c
>
> Modified: httpd/httpd/trunk/modules/md/mod_md.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md.c?rev=1838054&r1=1838053&r2=1838054&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/md/mod_md.c (original)
> +++ httpd/httpd/trunk/modules/md/mod_md.c Tue Aug 14 21:25:54 2018
> @@ -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>
>
> Modified: httpd/httpd/trunk/modules/md/mod_md_os.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md_os.c?rev=1838054&r1=1838053&r2=1838054&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/md/mod_md_os.c (original)
> +++ httpd/httpd/trunk/modules/md/mod_md_os.c Tue Aug 14 21:25:54 2018
> @@ -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>
>
>