Fix Android build of narrow_to_wide

diff --git a/src/util/string.cpp b/src/util/string.cpp
index 00499ff32f7b03353538e5b42a4d2c15a67a678a..de669b473e95c3f0749026512141f0c38531d8ee 100644 (file)
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -62,20 +62,21 @@ int wctomb(char *s, wchar_t wc)
 
 int mbtowc(wchar_t *pwc, const char *s, size_t n)
 {
-       wchar_t *intermediate = narrow_to_wide(s);
+       const wchar_t *tmp = narrow_to_wide_c(s);
 
-       if (intermediate.length() > 0) {
-               *pwc = intermediate[0];
+       if (tmp[0] != '\0') {
+               *pwc = tmp[0];
                return 1;
        } else {
                return -1;
        }
 }
+
 // You must free the returned string!
 const wchar_t *narrow_to_wide_c(const char *mbs)
 {
        size_t mbl = strlen(mbs);
-       wchar_t wcs = new wchar_t[mbl + 1];
+       wchar_t *wcs = new wchar_t[mbl + 1];
 
        for (size_t i = 0; i < mbl; i++) {
                if (((unsigned char) mbs[i] > 31) &&