From de1759ea3559971d585b2f96b2316fdfff50e8ce Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 5 Aug 2015 09:24:48 +0000
Subject: [PATCH] Move sdl_video_initialized into ciolib.c now since it's used
 there.

---
 src/conio/ciolib.c   | 4 ++++
 src/conio/sdlfuncs.c | 2 +-
 src/conio/sdlfuncs.h | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index 118e883635..04890ed4de 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -119,6 +119,10 @@ CIOLIBEXPORT int CIOLIBCALL ciolib_get_window_info(int *width, int *height, int
 CIOLIBEXPORT void CIOLIBCALL ciolib_setscaling(int new_value);
 CIOLIBEXPORT int CIOLIBCALL ciolib_getscaling(void);
 
+#if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
+int sdl_video_initialized = 0;
+#endif
+
 #define CIOLIB_INIT()		{ if(initialized != 1) initciolib(CIOLIB_MODE_AUTO); }
 
 #if defined(WITH_SDL) || defined(WITH_SDL_AUDIO)
diff --git a/src/conio/sdlfuncs.c b/src/conio/sdlfuncs.c
index 54621eb2f5..6e2cad06e0 100644
--- a/src/conio/sdlfuncs.c
+++ b/src/conio/sdlfuncs.c
@@ -11,6 +11,7 @@
  #undef main
 #endif
 #include "sdlfuncs.h"
+extern int sdl_video_initialized;
 
 #ifndef _WIN32
 struct sdlfuncs sdl;
@@ -25,7 +26,6 @@ struct sdlfuncs sdl;
 static int sdl_funcs_loaded=0;
 static int sdl_initialized=0;
 static int sdl_audio_initialized=0;
-int sdl_video_initialized=0;
 static int (*sdl_drawing_thread)(void *data)=NULL;
 static void (*sdl_exit_drawing_thread)(void)=NULL;
 static int main_returned=0;
diff --git a/src/conio/sdlfuncs.h b/src/conio/sdlfuncs.h
index b305225e8a..384c14ec06 100644
--- a/src/conio/sdlfuncs.h
+++ b/src/conio/sdlfuncs.h
@@ -79,7 +79,6 @@ struct sdlfuncs {
 /* Defined in SDL_win32_main.c for Win32 */
 extern struct sdlfuncs	sdl;
 extern SDL_sem *sdl_exit_sem;
-extern int sdl_video_initialized;
 
 #ifdef __cplusplus
 extern "C" {
-- 
GitLab