From 0dcd4dc7c48ca866ab5c4a39d968aa34c911224a Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 28 May 2013 14:23:17 +0200 Subject: [PATCH] xmltok: add hack to rename functions this avoids crashes due to clashes with libexpat, which might be pulled in dynamically e.g. on PC by libGL. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c4d700b463ecfbe2ed9239ebfa00d4439f3805a7 Author: Stefan Seyfried Date: 2013-05-28 (Tue, 28 May 2013) ------------------ This commit was generated by Migit --- lib/xmltree/xmltok.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/xmltree/xmltok.h b/lib/xmltree/xmltok.h index 6d0b91dff..cfbc427ba 100644 --- a/lib/xmltree/xmltok.h +++ b/lib/xmltree/xmltok.h @@ -21,6 +21,17 @@ Contributor(s): #ifndef XmlTok_INCLUDED #define XmlTok_INCLUDED 1 +/* ugly: prefix all functions to avoid clashing with "real" libexpat + * or similar pulled in by other libs e.g. on PC */ +#define XmlParseXmlDecl NEUTRINO_MP_XmlParseXmlDecl +#define XmlInitEncoding NEUTRINO_MP_XmlInitEncoding +#define XmlGetUtf8InternalEncoding NEUTRINO_MP_XmlGetUtf8InternalEncoding +#define XmlGetUtf16InternalEncoding NEUTRINO_MP_XmlGetUtf16InternalEncoding +#define XmlUtf8Encode NEUTRINO_MP_XmlUtf8Encode +#define XmlUtf16Encode NEUTRINO_MP_XmlUtf16Encode +#define XmlSizeOfUnknownEncoding NEUTRINO_MP_XmlSizeOfUnknownEncoding +#define XmlInitUnknownEncoding NEUTRINO_MP_XmlInitUnknownEncoding + #ifdef __cplusplus extern "C" { #endif