diff --git a/src/xenia/apu/sdl/sdl_audio_driver.cc b/src/xenia/apu/sdl/sdl_audio_driver.cc index aa42d8a04..344713ce3 100644 --- a/src/xenia/apu/sdl/sdl_audio_driver.cc +++ b/src/xenia/apu/sdl/sdl_audio_driver.cc @@ -31,24 +31,14 @@ SDLAudioDriver::~SDLAudioDriver() { }; bool SDLAudioDriver::Initialize() { - // With msvc delayed loading, exceptions are used to determine dll presence. -#if XE_PLATFORM_WIN32 - __try { -#endif // XE_PLATFORM_WIN32 - SDL_version ver = {}; - SDL_GetVersion(&ver); - if ((ver.major < 2) || - (ver.major == 2 && ver.minor == 0 && ver.patch < 8)) { - XELOGW( - "SDL library version {}.{}.{} is outdated. " - "You may experience choppy audio.", - ver.major, ver.minor, ver.patch); - } -#if XE_PLATFORM_WIN32 - } __except (EXCEPTION_EXECUTE_HANDLER) { - return false; + SDL_version ver = {}; + SDL_GetVersion(&ver); + if ((ver.major < 2) || (ver.major == 2 && ver.minor == 0 && ver.patch < 8)) { + XELOGW( + "SDL library version {}.{}.{} is outdated. " + "You may experience choppy audio.", + ver.major, ver.minor, ver.patch); } -#endif // XE_PLATFORM_WIN32 if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) { return false; diff --git a/src/xenia/hid/sdl/sdl_input_driver.cc b/src/xenia/hid/sdl/sdl_input_driver.cc index 05643d662..dca906f10 100644 --- a/src/xenia/hid/sdl/sdl_input_driver.cc +++ b/src/xenia/hid/sdl/sdl_input_driver.cc @@ -398,21 +398,12 @@ bool SDLInputDriver::TestSDLVersion() { const Uint8 min_patchlevel = 4; #endif - // With msvc delayed loading, exceptions are used to determine dll presence. -#if XE_PLATFORM_WIN32 - __try { -#endif // XE_PLATFORM_WIN32 - SDL_version ver = {}; - SDL_GetVersion(&ver); - if ((ver.major < 2) || - (ver.major == 2 && ver.minor == 0 && ver.patch < min_patchlevel)) { - return false; - } -#if XE_PLATFORM_WIN32 - } __except (EXCEPTION_EXECUTE_HANDLER) { + SDL_version ver = {}; + SDL_GetVersion(&ver); + if ((ver.major < 2) || + (ver.major == 2 && ver.minor == 0 && ver.patch < min_patchlevel)) { return false; } -#endif // XE_PLATFORM_WIN32 return true; }