diff options
author | Brad King <brad.king@kitware.com> | 2016-06-06 13:08:33 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-06-06 13:08:33 (GMT) |
commit | 182f645801baec94af14ea0deecd6e94fdf999ea (patch) | |
tree | 950a6f2783a216b64d31672a632c172943a3656e /Utilities/cmexpat/lib/expat_external.h | |
parent | 9d81f1b3aaa82d12a3a87067572b3ff5e2b9c4d2 (diff) | |
parent | eb83112347e16ac2c54690ae363935df9068ff78 (diff) | |
download | CMake-182f645801baec94af14ea0deecd6e94fdf999ea.zip CMake-182f645801baec94af14ea0deecd6e94fdf999ea.tar.gz CMake-182f645801baec94af14ea0deecd6e94fdf999ea.tar.bz2 |
Merge branch 'upstream-expat' into update-expat
* upstream-expat:
expat 2016-06-05 (2b9cb7f5)
Diffstat (limited to 'Utilities/cmexpat/lib/expat_external.h')
-rw-r--r-- | Utilities/cmexpat/lib/expat_external.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Utilities/cmexpat/lib/expat_external.h b/Utilities/cmexpat/lib/expat_external.h index b2be17b..07a3c5c 100644 --- a/Utilities/cmexpat/lib/expat_external.h +++ b/Utilities/cmexpat/lib/expat_external.h @@ -67,12 +67,26 @@ #endif #endif /* not defined XML_STATIC */ +#if !defined(XMLIMPORT) && defined(__GNUC__) && (__GNUC__ >= 4) +#define XMLIMPORT __attribute__ ((visibility ("default"))) +#endif /* If we didn't define it above, define it away: */ #ifndef XMLIMPORT #define XMLIMPORT #endif +#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)) +#define XML_ATTR_MALLOC __attribute__((__malloc__)) +#else +#define XML_ATTR_MALLOC +#endif + +#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +#define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) +#else +#define XML_ATTR_ALLOC_SIZE(x) +#endif #define XMLPARSEAPI(type) XMLIMPORT type XMLCALL |