From: Graham Leggett <minfrin@apache.org>
Date: Wed, 1 Jan 2020 22:23:19 +0000 (+0000)
Subject: Backport r1867183.
X-Git-Tag: 2.4.42~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fa66edd1a95ffa511914f5f3c703612fba77e15;p=thirdparty%2Fapache%2Fhttpd.git

Backport r1867183.
mod_proxy_html, mod_xml2enc: Fix build issues with macOS due to r1864469


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1872220 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index fc99aeadd8e..288a9dc4012 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.42
-   
+
+  *) mod_proxy_html, mod_xml2enc: Fix build issues with macOS due to r1864469
+     [Jim Jagielski]
+ 
   *) mod_authn_socache: Increase the maximum length of strings that can be cached by
      the module from 100 to 256.  PR 62149 [<thorsten.meinl knime.com>]
 
diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c
index 6fb83215355..60f9324e644 100644
--- a/modules/filters/mod_proxy_html.c
+++ b/modules/filters/mod_proxy_html.c
@@ -30,25 +30,25 @@
 #endif
 
 /* libxml2 includes unicode/[...].h files which uses C++ comments */
-#if defined(__GNUC__)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wcomment"
+#elif defined(__GNUC__)
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic warning "-Wcomment"
 #endif
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wcomment"
 #endif
 
 /* libxml2 */
 #include <libxml/HTMLparser.h>
 
-#if defined(__GNUC__)
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 #pragma GCC diagnostic pop
 #endif
-#elif defined(__clang__)
-#pragma clang diagnostic pop
 #endif
 
 #include "http_protocol.h"
diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
index 24047b0e989..95f8bf8e446 100644
--- a/modules/filters/mod_xml2enc.c
+++ b/modules/filters/mod_xml2enc.c
@@ -24,25 +24,25 @@
 #include <ctype.h>
 
 /* libxml2 includes unicode/[...].h files which uses C++ comments */
-#if defined(__GNUC__)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wcomment"
+#elif defined(__GNUC__)
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic warning "-Wcomment"
 #endif
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wcomment"
 #endif
 
 /* libxml2 */
 #include <libxml/encoding.h>
 
-#if defined(__GNUC__)
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 #pragma GCC diagnostic pop
 #endif
-#elif defined(__clang__)
-#pragma clang diagnostic pop
 #endif
 
 #include "http_protocol.h"