From ef661a2e25f5bbb99dc3d5a06b8efe92d294c921 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 6 Apr 2017 16:17:00 +0200
Subject: [PATCH] Move unicode headers in cpp.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unicode headers ends by defining the DONE symbol in a enum.
It can clash with other includes.
(For instance the httpd.h from apache who use `#define DONE -2`).

Both project should not declare such common symbols publicly but we have
to do with them anyway.
---
 include/common/stringTools.h | 6 ------
 src/common/stringTools.cpp   | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/common/stringTools.h b/include/common/stringTools.h
index 788b26857..179bfa02a 100644
--- a/include/common/stringTools.h
+++ b/include/common/stringTools.h
@@ -20,13 +20,7 @@
 #ifndef KIWIX_STRINGTOOLS_H
 #define KIWIX_STRINGTOOLS_H
 
-#include <unicode/translit.h>
-#include <unicode/normlzr.h>
 #include <unicode/unistr.h>
-#include <unicode/rep.h>
-#include <unicode/uniset.h>
-#include <unicode/ustring.h>
-#include <unicode/ucnv.h>
 
 #include <iostream>
 #include <vector>
diff --git a/src/common/stringTools.cpp b/src/common/stringTools.cpp
index c5b768ce1..120a9c6f8 100644
--- a/src/common/stringTools.cpp
+++ b/src/common/stringTools.cpp
@@ -19,6 +19,13 @@
 
 #include <common/stringTools.h>
 
+#include <unicode/translit.h>
+#include <unicode/normlzr.h>
+#include <unicode/ustring.h>
+#include <unicode/rep.h>
+#include <unicode/uniset.h>
+#include <unicode/ucnv.h>
+
 /* tell ICU where to find its dat file (tables) */
 void kiwix::loadICUExternalTables() {
 #ifdef __APPLE__