More work on cleaning out compiler warnings.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 11 Sep 2011 04:02:40 -0400
changeset 5889c2059a52efa1
parent 5888 cff0278fa1f8
child 5902 d3d839b15c2f
More work on cleaning out compiler warnings.
src/thread/windows/SDL_systhread.c
src/video/windows/SDL_windowsevents.c
     1.1 --- a/src/thread/windows/SDL_systhread.c	Sun Sep 11 03:35:46 2011 -0400
     1.2 +++ b/src/thread/windows/SDL_systhread.c	Sun Sep 11 04:02:40 2011 -0400
     1.3 @@ -77,7 +77,7 @@
     1.4      pfnSDL_CurrentEndThread pfnCurrentEndThread;
     1.5  } tThreadStartParms, *pThreadStartParms;
     1.6  
     1.7 -static DWORD __stdcall
     1.8 +static unsigned __stdcall
     1.9  RunThread(void *data)
    1.10  {
    1.11      pThreadStartParms pThreadParms = (pThreadStartParms) data;
    1.12 @@ -115,7 +115,7 @@
    1.13      pfnSDL_CurrentEndThread pfnEndThread = _endthreadex;
    1.14  #endif
    1.15  #endif /* SDL_PASSED_BEGINTHREAD_ENDTHREAD */
    1.16 -    unsigned threadid;
    1.17 +    DWORD threadid = 0;
    1.18      pThreadStartParms pThreadParms =
    1.19          (pThreadStartParms) SDL_malloc(sizeof(tThreadStartParms));
    1.20      if (!pThreadParms) {
     2.1 --- a/src/video/windows/SDL_windowsevents.c	Sun Sep 11 03:35:46 2011 -0400
     2.2 +++ b/src/video/windows/SDL_windowsevents.c	Sun Sep 11 04:02:40 2011 -0400
     2.3 @@ -557,7 +557,8 @@
     2.4  				for (i = 0; i < num_inputs; ++i) {
     2.5  					PTOUCHINPUT input = &inputs[i];
     2.6  
     2.7 -					SDL_TouchID touchId = (SDL_TouchID)input->hSource;
     2.8 +					const SDL_TouchID touchId = (SDL_TouchID)
     2.9 +												((size_t)input->hSource);
    2.10  					if (!SDL_GetTouch(touchId)) {
    2.11  						SDL_Touch touch;
    2.12