summaryrefslogtreecommitdiff
path: root/src/utils/xml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-13 18:40:11 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-13 18:40:11 +0300
commit55b1de961489f99723288e162f9d3a062d593368 (patch)
tree8e0420837f222828070fd7df010ede11c2ec90ed /src/utils/xml
parentbcbcdde49b5ff85c5ff4b8356dad475698d28f4e (diff)
downloadmanaplus-55b1de961489f99723288e162f9d3a062d593368.tar.gz
manaplus-55b1de961489f99723288e162f9d3a062d593368.tar.bz2
manaplus-55b1de961489f99723288e162f9d3a062d593368.tar.xz
manaplus-55b1de961489f99723288e162f9d3a062d593368.zip
Fix includes and update deheader ci script.
Diffstat (limited to 'src/utils/xml')
-rw-r--r--src/utils/xml/libxml.h3
-rw-r--r--src/utils/xml/libxml.inc4
-rw-r--r--src/utils/xml/pugixml.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h
index 49968123e..1f5233ea0 100644
--- a/src/utils/xml/libxml.h
+++ b/src/utils/xml/libxml.h
@@ -25,13 +25,14 @@
#ifdef ENABLE_LIBXML
+#define XML_INCLUDE_DEFINE
+
#include "enums/simpletypes/skiperror.h"
#include "enums/simpletypes/useresman.h"
#include "utils/xml/libxml.inc"
#include <libxml/tree.h>
-#include <libxml/xmlwriter.h>
#include <string>
diff --git a/src/utils/xml/libxml.inc b/src/utils/xml/libxml.inc
index 238eafec9..ea847b88f 100644
--- a/src/utils/xml/libxml.inc
+++ b/src/utils/xml/libxml.inc
@@ -23,6 +23,10 @@
#ifdef ENABLE_LIBXML
+#include <libxml/xmlwriter.h>
+
+__XML_XMLWRITER_H__
+
#define XmlNodePtr xmlNodePtr
#define XmlNodePtrConst xmlNode *const
#define XmlStrEqual(str1, str2) xmlStrEqual(str1, \
diff --git a/src/utils/xml/pugixml.h b/src/utils/xml/pugixml.h
index ed4456bb7..ef7b3e798 100644
--- a/src/utils/xml/pugixml.h
+++ b/src/utils/xml/pugixml.h
@@ -25,6 +25,8 @@
#ifdef ENABLE_PUGIXML
+#define XML_INCLUDE_DEFINE
+
#include "enums/simpletypes/skiperror.h"
#include "enums/simpletypes/useresman.h"