From: Stefan Eissing <icing@apache.org>
Date: Tue, 26 Sep 2017 08:22:52 +0000 (+0000)
Subject: On the trunk:
X-Git-Tag: 2.5.0-alpha~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a8adef6171488c23553eedc57cad5d1385595eb;p=thirdparty%2Fapache%2Fhttpd.git

On the trunk:

mod_ssl: make the new module flag used.



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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 8fb54b31dc0..9744fcebdae 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -838,7 +838,7 @@ module AP_MODULE_DECLARE_DATA ssl_module = {
     ssl_config_server_merge,    /* merge  per-server config structures */
     ssl_config_cmds,            /* table of configuration directives   */
     ssl_register_hooks          /* register hooks */
-#if AP_MODULE_HAS_FLAGS
+#if defined(AP_MODULE_HAS_FLAGS)
    ,AP_MODULE_FLAG_ALWAYS_MERGE /* flags */
 #endif
 };