smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Re move ANDROID pragma. This is not useful anymore (libicu) is now included" 

This reverts commit 8a458417aa612409b8da9a44b9015786c2063244.
This commit is contained in:
Julian Harty 2014-10-08 10:44:55 +01:00
parent 05dc41157c
commit 378c66e16c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/stringTools.cpp
View File

@ -33,6 +33,8 @@ void kiwix::loadICUExternalTables() {
#endif #endif
} }
#ifndef __ANDROID__
/* Prepare integer for display */ /* Prepare integer for display */
std::string kiwix::beautifyInteger(const unsigned int number) { std::string kiwix::beautifyInteger(const unsigned int number) {
std::stringstream numberStream; std::stringstream numberStream;
@ -141,6 +143,8 @@ std::string kiwix::urlEncode(const std::string &c) {
return escaped; return escaped;
} }
#endif
static char charFromHex(std::string a) { static char charFromHex(std::string a) {
std::istringstream Blat(a); std::istringstream Blat(a);
int Z; int Z;

4
src/common/stringTools.h
View File

@ -39,6 +39,8 @@
namespace kiwix { namespace kiwix {
#ifndef __ANDROID__
std::string removeAccents(const std::string &text); std::string removeAccents(const std::string &text);
std::string beautifyInteger(const unsigned int number); std::string beautifyInteger(const unsigned int number);
std::string beautifyFileSize(const unsigned int number); std::string beautifyFileSize(const unsigned int number);
@ -47,6 +49,8 @@ namespace kiwix {
void printStringInHexadecimal(UnicodeString s); void printStringInHexadecimal(UnicodeString s);
void stringReplacement(std::string& str, const std::string& oldStr, const std::string& newStr); void stringReplacement(std::string& str, const std::string& oldStr, const std::string& newStr);
#endif
void loadICUExternalTables(); void loadICUExternalTables();
std::string urlDecode(const std::string &c); std::string urlDecode(const std::string &c);