diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-02-11 02:27:43 -0500 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2015-02-11 02:28:22 -0500 |
| commit | 98b37e3e0d4d0bcea4d0a202f8519a39163b7493 (patch) | |
| tree | d7fe385861116712ec457bc906ba0656b4ceda89 | |
| parent | f824866686ddba471a7b0c3178eaf968883bb69e (diff) | |
| download | minetest-98b37e3e0d4d0bcea4d0a202f8519a39163b7493.tar.gz minetest-98b37e3e0d4d0bcea4d0a202f8519a39163b7493.tar.bz2 minetest-98b37e3e0d4d0bcea4d0a202f8519a39163b7493.zip | |
Fix Android build of narrow_to_wide
| -rw-r--r-- | src/util/string.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/util/string.cpp b/src/util/string.cpp index b4908d62d..c18e58613 100644 --- 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) && |