diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-15 11:01:15 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-15 11:01:39 +0100 |
| commit | 0429ec4cfde636dd8dda3d1a0dcf6e175c821196 (patch) | |
| tree | 82328d7431a3eb14496989d1eee6721db066b462 /src/util/string.h | |
| parent | a740a48f62261073190a92e9b60256da13817923 (diff) | |
| download | minetest-0429ec4cfde636dd8dda3d1a0dcf6e175c821196.tar.gz minetest-0429ec4cfde636dd8dda3d1a0dcf6e175c821196.tar.bz2 minetest-0429ec4cfde636dd8dda3d1a0dcf6e175c821196.zip | |
Android: update makefile and backport language fix from master
Diffstat (limited to 'src/util/string.h')
| -rw-r--r-- | src/util/string.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/util/string.h b/src/util/string.h index 388184ca4..dc520e3a8 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -36,11 +36,13 @@ struct FlagDesc { u32 flag; }; + // You must free the returned string! -const wchar_t *narrow_to_wide_c(const char *mbs); +// The returned string is allocated using new +wchar_t *narrow_to_wide_c(const char *str); -std::wstring narrow_to_wide(const std::string& mbs); -std::string wide_to_narrow(const std::wstring& wcs); +std::wstring narrow_to_wide(const std::string &mbs); +std::string wide_to_narrow(const std::wstring &wcs); std::string translatePassword(std::string playername, std::wstring password); std::string urlencode(std::string str); std::string urldecode(std::string str); |