From 378c66e16c998737b1af5e321f570bde625b6b9e Mon Sep 17 00:00:00 2001
From: Julian Harty <julianharty@gmail.com>
Date: Wed, 8 Oct 2014 10:44:55 +0100
Subject: [PATCH] Revert "Re move ANDROID pragma. This is not useful anymore
 (libicu) is now included"

This reverts commit 8a458417aa612409b8da9a44b9015786c2063244.
---
 src/common/stringTools.cpp | 4 ++++
 src/common/stringTools.h   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/common/stringTools.cpp b/src/common/stringTools.cpp
index ef57cab3c..15913b1cc 100644
--- a/src/common/stringTools.cpp
+++ b/src/common/stringTools.cpp
@@ -33,6 +33,8 @@ void kiwix::loadICUExternalTables() {
 #endif
 }
 
+#ifndef __ANDROID__
+
 /* Prepare integer for display */
 std::string kiwix::beautifyInteger(const unsigned int number) {
   std::stringstream numberStream;
@@ -141,6 +143,8 @@ std::string kiwix::urlEncode(const std::string &c) {
   return escaped;
 }
 
+#endif
+
 static char charFromHex(std::string a) {
   std::istringstream Blat(a);
   int Z;
diff --git a/src/common/stringTools.h b/src/common/stringTools.h
index c03953c7f..8a6683af5 100644
--- a/src/common/stringTools.h
+++ b/src/common/stringTools.h
@@ -39,6 +39,8 @@
 
 namespace kiwix {
 
+#ifndef __ANDROID__
+
   std::string removeAccents(const std::string &text);
   std::string beautifyInteger(const unsigned int number);
   std::string beautifyFileSize(const unsigned int number);
@@ -47,6 +49,8 @@ namespace kiwix {
   void printStringInHexadecimal(UnicodeString s);
   void stringReplacement(std::string& str, const std::string& oldStr, const std::string& newStr);
 
+#endif
+
   void loadICUExternalTables();
   std::string urlDecode(const std::string &c);