From 097b9c3084399bd356f599644237474b02dbbcf0 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 17 Oct 2019 17:51:49 -0700 Subject: [PATCH] Better fix for iOS build --- src/SDL.c | 4 ++-- src/SDL_assert.c | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/SDL.c b/src/SDL.c index aa09b95e7..2990e0636 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -22,9 +22,9 @@ #if defined(__WIN32__) #include "core/windows/SDL_windows.h" +#elif !defined(__WINRT__) +#include // For _exit(), etc. #endif -#if defined(__IPHONEOS__) -#include #endif #if defined(__EMSCRIPTEN__) diff --git a/src/SDL_assert.c b/src/SDL_assert.c index ea9715750..3243a765b 100644 --- a/src/SDL_assert.c +++ b/src/SDL_assert.c @@ -36,12 +36,9 @@ #ifndef WS_OVERLAPPEDWINDOW #define WS_OVERLAPPEDWINDOW 0 #endif -#else /* fprintf, _exit(), etc. */ +#else /* fprintf, etc. */ #include #include -#if ! defined(__WINRT__) -#include -#endif #endif #if defined(__EMSCRIPTEN__) @@ -124,10 +121,10 @@ static void SDL_GenerateAssertionReport(void) parts of SDL, because we don't want anything calling it without an extremely good reason. */ #if defined(__WATCOMC__) -void SDL_ExitProcess(const int exitcode); +extern void SDL_ExitProcess(const int exitcode); #pragma aux SDL_ExitProcess aborts; #endif -SDL_NORETURN void SDL_ExitProcess(const int exitcode); +extern SDL_NORETURN void SDL_ExitProcess(const int exitcode); #if defined(__WATCOMC__)