SourceFormat Enforcement

[thirdparty/squid.git] / src / esi / Libxml2Parser.h

diff --git a/src/esi/Libxml2Parser.h b/src/esi/Libxml2Parser.h
index 423aba1eef7f88f66572205f8c8735ea0c0154e1..8149383047dc25ce20d35b159deac549f1ce161c 100644 (file)
--- a/src/esi/Libxml2Parser.h
+++ b/src/esi/Libxml2Parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -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