From 01ac8bad77156f50ba57ddff5306714dc3815ef3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Feb 2017 05:25:21 +0300
Subject: Fix compilation with pugixml.

Add macroses for XmlChar and XmlConstChar.
---
 src/gui/theme.cpp            | 8 ++++----
 src/resources/db/deaddb.cpp  | 2 +-
 src/resources/db/questdb.cpp | 2 +-
 src/utils/xml/libxml.inc     | 2 ++
 src/utils/xml/pugixml.inc    | 2 ++
 5 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 9fa1b59ec..1888627d1 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -1179,7 +1179,7 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name,
 
 #define readValue(name) \
         { \
-            tmpData = reinterpret_cast<char*>( \
+            tmpData = reinterpret_cast<XmlChar*>( \
                 XmlNodeGetContent(infoNode)); \
             info->name = tmpData; \
             XmlFree(tmpData); \
@@ -1187,7 +1187,7 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name,
 
 #define readIntValue(name) \
         { \
-            tmpData = reinterpret_cast<char*>( \
+            tmpData = reinterpret_cast<XmlChar*>( \
                 XmlNodeGetContent(infoNode)); \
             info->name = atoi(tmpData); \
             XmlFree(tmpData); \
@@ -1195,7 +1195,7 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name,
 
 #define readFloatValue(name) \
         { \
-            tmpData = reinterpret_cast<char*>( \
+            tmpData = reinterpret_cast<XmlChar*>( \
                 XmlNodeGetContent(infoNode)); \
             info->name = static_cast<float>(atof(tmpData)); \
             XmlFree(tmpData); \
@@ -1231,7 +1231,7 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName)
 
     const std::string fontSize2("fontSize_" + mScreenDensity);
     const std::string npcfontSize2("npcfontSize_" + mScreenDensity);
-    char *tmpData = nullptr;
+    XmlChar *tmpData = nullptr;
     for_each_xml_child_node(infoNode, rootNode)
     {
         if (xmlNameEqual(infoNode, "name"))
diff --git a/src/resources/db/deaddb.cpp b/src/resources/db/deaddb.cpp
index 778d88a0b..2d9293e0f 100644
--- a/src/resources/db/deaddb.cpp
+++ b/src/resources/db/deaddb.cpp
@@ -73,7 +73,7 @@ void DeadDB::loadXmlFile(const std::string &fileName,
         }
         else if (xmlNameEqual(node, "message"))
         {
-            char *const data = reinterpret_cast<char*>(
+            XmlChar *const data = reinterpret_cast<XmlChar*>(
                 XmlNodeGetContent(node));
             if (!data)
                 continue;
diff --git a/src/resources/db/questdb.cpp b/src/resources/db/questdb.cpp
index da05721b1..89228f038 100644
--- a/src/resources/db/questdb.cpp
+++ b/src/resources/db/questdb.cpp
@@ -83,7 +83,7 @@ static void loadQuest(const int var,
     {
         if (!xmlTypeEqual(dataNode, XML_ELEMENT_NODE))
             continue;
-        char *const data = reinterpret_cast<char*>(
+        XmlChar *const data = reinterpret_cast<XmlChar*>(
             XmlNodeGetContent(dataNode));
         if (!data)
             continue;
diff --git a/src/utils/xml/libxml.inc b/src/utils/xml/libxml.inc
index b342fe59d..1bf4fddd5 100644
--- a/src/utils/xml/libxml.inc
+++ b/src/utils/xml/libxml.inc
@@ -61,6 +61,8 @@ __XML_XMLWRITER_H__
     (node)->xmlChildrenNode->content)
 #define XmlFree(ptr) xmlFree(ptr)
 #define XmlNodeDefault nullptr
+#define XmlChar char
+#define XmlConstChar const char
 
 #endif  // ENABLE_LIBXML
 #endif  // UTILS_XML_LIBXML_INC
diff --git a/src/utils/xml/pugixml.inc b/src/utils/xml/pugixml.inc
index 31ceee0eb..d8ef38242 100644
--- a/src/utils/xml/pugixml.inc
+++ b/src/utils/xml/pugixml.inc
@@ -47,6 +47,8 @@
 #define XmlTextWriterStartDocument(writer, p1, p2, p3)
 #define XmlTextWriterEndDocument(writer) (writer)->endDocument()
 #define XmlFreeTextWriter(writer) delete writer
+#define XmlChar const char
+#define XmlConstChar const char
 
 #endif  // ENABLE_PUGIXML
 #endif  // UTILS_XML_PUGIXML_INC
-- 
cgit v1.2.3-60-g2f50