From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 20 Aug 2015 12:01:01 +0000 (+0200)
Subject: Rework r14231, hopefully in a more portable way
X-Git-Tag: SQUID_4_0_1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=990104aca043a6993a7b8ea7125b252006002a47;p=thirdparty%2Fsquid.git

Rework r14231, hopefully in a more portable way
---

diff --git a/src/esi/Libxml2Parser.h b/src/esi/Libxml2Parser.h
index 423aba1eef..6128716170 100644
--- a/src/esi/Libxml2Parser.h
+++ b/src/esi/Libxml2Parser.h
@@ -25,10 +25,12 @@
 #undef free
 #endif
 
-#ifdef __clang__
-// workaround for clang complaining of unknown attributes in libxml2
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-attributes"
+#if __clang__ 
+// workaround for clang complaining of unknown attributes in libxml2 on fedora22
+#ifdef LIBXML_ATTR_ALLOC_SIZE
+#undef LIBXML_ATTR_ALLOC_SIZE
+#endif
+#define LIBXML_ATTR_ALLOC_SIZE(x)
 #endif /* __clang__ */
 
 #if HAVE_LIBXML_PARSER_H
@@ -41,10 +43,6 @@
 #include <libxml/HTMLtree.h>
 #endif
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 #ifdef OLD_FREE
 #define free OLD_FREE
 #endif