You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2019/09/19 15:50:43 UTC
svn commit: r1867183 - in /httpd/httpd/trunk/modules/filters:
mod_proxy_html.c mod_xml2enc.c
Author: jim
Date: Thu Sep 19 15:50:43 2019
New Revision: 1867183
URL: http://svn.apache.org/viewvc?rev=1867183&view=rev
Log:
Reverse the order of the test... if clang, then use clang, because some clangs also represent as GNUC.
This fixes breaking the macOS builds due to r1864435 under maint-mode
Modified:
httpd/httpd/trunk/modules/filters/mod_proxy_html.c
httpd/httpd/trunk/modules/filters/mod_xml2enc.c
Modified: httpd/httpd/trunk/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_proxy_html.c?rev=1867183&r1=1867182&r2=1867183&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_proxy_html.c Thu Sep 19 15:50:43 2019
@@ -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"
Modified: httpd/httpd/trunk/modules/filters/mod_xml2enc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_xml2enc.c?rev=1867183&r1=1867182&r2=1867183&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_xml2enc.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_xml2enc.c Thu Sep 19 15:50:43 2019
@@ -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"