diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-14 23:38:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-14 23:40:46 +0300 |
| commit | 015515ba20b66195840afd1c0c074f0729995a2d (patch) | |
| tree | c1aaf12666cc031dd15e02b74dd0c1a5cc57a74b /src/utils | |
| parent | 1f67b67fcd391d5658e46f40756720199bd0004b (diff) | |
| download | manaplus-015515ba20b66195840afd1c0c074f0729995a2d.tar.gz manaplus-015515ba20b66195840afd1c0c074f0729995a2d.tar.bz2 manaplus-015515ba20b66195840afd1c0c074f0729995a2d.tar.xz manaplus-015515ba20b66195840afd1c0c074f0729995a2d.zip | |
Add some android fixes.
Partial impliment option to enable/disable mumble support.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/paths.cpp | 3 | ||||
| -rw-r--r-- | src/utils/stringutils.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index 11ad19a2e..f67a6c473 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -48,12 +48,13 @@ std::string getRealPath(const std::string &str) { std::string path; -#if defined __OpenBSD__ +#if defined(__OpenBSD__) || defined(__ANDROID__) char *realPath = (char*)calloc(PATH_MAX, sizeof(char)); realpath(str.c_str(), realPath); #else char *realPath = realpath(str.c_str(), nullptr); #endif + if (!realPath) return ""; path = realPath; diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 2ceab5b92..c201e9593 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -29,6 +29,7 @@ #include <list> #include <sys/time.h> +#include <ctype.h> #include "debug.h" |