Better fix for iOS build

libsdl-org · Oct 18, 2019 · 097b9c3 · 097b9c3
1 parent 8984d25
commit 097b9c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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 <unistd.h> // For _exit(), etc.
 #endif
-#if defined(__IPHONEOS__)
-#include <unistd.h>
 #endif
 
 #if defined(__EMSCRIPTEN__)

diff --git 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 <stdio.h>
 #include <stdlib.h>
-#if ! defined(__WINRT__)
-#include <unistd.h>
-#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__)