From 6dba0bbfd421121056fba0d348794ead2928c662 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Mon, 19 Aug 2019 18:16:20 +0200 Subject: SDL: Remove check for SDL2 in convertEncoding() SDL_iconv_string() is available even with SDL1 --- backends/platform/sdl/sdl.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'backends/platform') 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) } -- cgit v1.2.3