------------------------------------------------------------ revno: 13894 revision-id: squid3@treenet.co.nz-20150821005450-yzh2ft4yuwad2mt5 parent: squid3@treenet.co.nz-20150821003155-po0yyrs6a9p50dzv author: Francesco Chemolli committer: Amos Jeffries branch nick: 3.5 timestamp: Thu 2015-08-20 17:54:50 -0700 message: Work around clang-3.6 complaining of unknown attributes in libxml2 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150821005450-yzh2ft4yuwad2mt5 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 7675c758e04c993e81254e9c1c94d8e6f6d1e4df # timestamp: 2015-08-21 01:50:57 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150821003155-\ # po0yyrs6a9p50dzv # # Begin patch === modified file 'src/esi/Libxml2Parser.h' --- src/esi/Libxml2Parser.h 2015-01-13 09:13:49 +0000 +++ src/esi/Libxml2Parser.h 2015-08-21 00:54:50 +0000 @@ -24,6 +24,15 @@ #define OLD_FREE free #undef free #endif + +#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 #include #endif