More Cygwin compiler warnings... SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Sun, 11 Sep 2011 22:31:53 -0400
branchSDL-1.2
changeset 589790faab009401
parent 5896 157ed9eff378
child 5898 17c2babefa47
More Cygwin compiler warnings...
include/SDL_thread.h
src/video/wincommon/SDL_sysevents.c
     1.1 --- a/include/SDL_thread.h	Sun Sep 11 15:24:44 2011 -0400
     1.2 +++ b/include/SDL_thread.h	Sun Sep 11 22:31:53 2011 -0400
     1.3 @@ -68,6 +68,11 @@
     1.4  #ifdef __OS2__
     1.5  typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); 
     1.6  typedef void (*pfnSDL_CurrentEndThread)(void);
     1.7 +#elif defined(__CYGWIN__) && !defined(__MINGW32__)
     1.8 +typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
     1.9 +        unsigned (__stdcall *func)(void *), void *arg, 
    1.10 +        unsigned, unsigned *threadID);
    1.11 +typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
    1.12  #else
    1.13  typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
    1.14          unsigned (__stdcall *func)(void *), void *arg, 
     2.1 --- a/src/video/wincommon/SDL_sysevents.c	Sun Sep 11 15:24:44 2011 -0400
     2.2 +++ b/src/video/wincommon/SDL_sysevents.c	Sun Sep 11 22:31:53 2011 -0400
     2.3 @@ -762,7 +762,10 @@
     2.4  #ifndef NO_GETKEYBOARDSTATE
     2.5  	/* Initialise variables for SDL_ToUnicode() */
     2.6  	codepage = GetCodePage();
     2.7 -	SDL_ToUnicode = Is9xME() ? ToUnicode9xME : ToUnicode;
     2.8 +
     2.9 +	/* Cygwin headers don't match windows.h, so we have to cast around a
    2.10 +	   const issue here... */
    2.11 +	SDL_ToUnicode = Is9xME() ? ToUnicode9xME : (ToUnicodeFn) ToUnicode;
    2.12  #endif
    2.13  
    2.14  	app_registered = 1;