From 015515ba20b66195840afd1c0c074f0729995a2d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Oct 2012 23:38:39 +0300 Subject: Add some android fixes. Partial impliment option to enable/disable mumble support. --- src/utils/paths.cpp | 3 ++- src/utils/stringutils.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/utils') 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 #include +#include #include "debug.h" -- cgit v1.2.3-60-g2f50