diff options
| author | Jaromir Wysoglad | 2019-08-19 18:16:20 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-08-24 18:12:45 +0300 |
| commit | 6dba0bbfd421121056fba0d348794ead2928c662 (patch) | |
| tree | 4f83ce8ce6a907d71ea36251977c8755814a660e /backends/platform/sdl | |
| parent | 4de634ee7646410eb8f330f6974f9ee8eb594b1f (diff) | |
| download | scummvm-rg350-6dba0bbfd421121056fba0d348794ead2928c662.tar.gz scummvm-rg350-6dba0bbfd421121056fba0d348794ead2928c662.tar.bz2 scummvm-rg350-6dba0bbfd421121056fba0d348794ead2928c662.zip | |
SDL: Remove check for SDL2 in convertEncoding()
SDL_iconv_string() is available even with SDL1
Diffstat (limited to 'backends/platform/sdl')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 800df58ed3..b9cccbf5e8 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -769,15 +769,11 @@ int SDL_SetColorKey_replacement(SDL_Surface *surface, Uint32 flag, Uint32 key) { #endif char *OSystem_SDL::convertEncoding(const char *to, const char *from, const char *string, size_t length) { -#if SDL_VERSION_ATLEAST(2, 0, 0) int zeroBytes = 1; if (Common::String(from).hasPrefixIgnoreCase("utf-16")) zeroBytes = 2; if (Common::String(from).hasPrefixIgnoreCase("utf-32")) zeroBytes = 4; return SDL_iconv_string(to, from, string, length + zeroBytes); -#else - return nullptr; -#endif // SDL_VERSION_ATLEAST(2, 0, 0) } |