More Cygwin compiler warnings...

libsdl-org · Sep 12, 2011 · 8d4d17e · 8d4d17e
1 parent f16a0c6
commit 8d4d17e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/include/SDL_thread.h b/include/SDL_thread.h
@@ -68,6 +68,11 @@ typedef struct SDL_Thread SDL_Thread;
 #ifdef __OS2__
 typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); 
 typedef void (*pfnSDL_CurrentEndThread)(void);
+#elif defined(__CYGWIN__) && !defined(__MINGW32__)
+typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
+        unsigned (__stdcall *func)(void *), void *arg, 
+        unsigned, unsigned *threadID);
+typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
 #else
 typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
         unsigned (__stdcall *func)(void *), void *arg, 

diff --git a/src/video/wincommon/SDL_sysevents.c b/src/video/wincommon/SDL_sysevents.c
@@ -762,7 +762,10 @@ int SDL_RegisterApp(char *name, Uint32 style, void *hInst)
 #ifndef NO_GETKEYBOARDSTATE
 	/* Initialise variables for SDL_ToUnicode() */
 	codepage = GetCodePage();
-	SDL_ToUnicode = Is9xME() ? ToUnicode9xME : ToUnicode;
+
+	/* Cygwin headers don't match windows.h, so we have to cast around a
+	   const issue here... */
+	SDL_ToUnicode = Is9xME() ? ToUnicode9xME : (ToUnicodeFn) ToUnicode;
 #endif
 
 	app_registered = 1;