1.1 --- a/src/audio/windx5/directx.h	Sun Feb 28 23:45:02 2010 -0800
     1.2 +++ b/src/audio/windx5/directx.h	Wed Mar 10 15:04:13 2010 +0000
     1.3 @@ -2,6 +2,10 @@
     1.4  #ifndef _directx_h
     1.5  #define _directx_h
     1.6  
     1.7 +#ifdef __GNUC__
     1.8 +#define NONAMELESSUNION
     1.9 +#endif
    1.10 +
    1.11  /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
    1.12  
    1.13  #define WIN32_LEAN_AND_MEAN
    1.14 @@ -74,9 +78,6 @@
    1.15  #define DIRECTSOUND_VERSION 0x0500
    1.16  #define DIRECTINPUT_VERSION 0x0500
    1.17  
    1.18 -#ifdef __GNUC__
    1.19 -#define NONAMELESSUNION
    1.20 -#endif
    1.21  #include <ddraw.h>
    1.22  #include <dsound.h>
    1.23  #include <dinput.h>

     2.1 --- a/src/thread/win32/SDL_systhread.c	Sun Feb 28 23:45:02 2010 -0800
     2.2 +++ b/src/thread/win32/SDL_systhread.c	Wed Mar 10 15:04:13 2010 +0000
     2.3 @@ -37,7 +37,7 @@
     2.4  #endif
     2.5  
     2.6  #if __GNUC__
     2.7 -typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
     2.8 +typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
     2.9          unsigned (__stdcall *func)(void *), void *arg, 
    2.10          unsigned, unsigned *threadID);
    2.11  typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);

     3.1 --- a/src/video/windx5/SDL_dx5yuv.c	Sun Feb 28 23:45:02 2010 -0800
     3.2 +++ b/src/video/windx5/SDL_dx5yuv.c	Wed Mar 10 15:04:13 2010 +0000
     3.3 @@ -22,7 +22,7 @@
     3.4  #include "SDL_config.h"
     3.5  
     3.6  /* This is the DirectDraw implementation of YUV video overlays */
     3.7 -
     3.8 +#include "directx.h"
     3.9  #include "SDL_video.h"
    3.10  #include "SDL_dx5yuv_c.h"
    3.11  #include "../SDL_yuvfuncs.h"

     4.1 --- a/src/video/windx5/directx.h	Sun Feb 28 23:45:02 2010 -0800
     4.2 +++ b/src/video/windx5/directx.h	Wed Mar 10 15:04:13 2010 +0000
     4.3 @@ -2,6 +2,10 @@
     4.4  #ifndef _directx_h
     4.5  #define _directx_h
     4.6  
     4.7 +#ifdef __GNUC__
     4.8 +#define NONAMELESSUNION
     4.9 +#endif
    4.10 +
    4.11  /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
    4.12  
    4.13  #define WIN32_LEAN_AND_MEAN
    4.14 @@ -74,9 +78,6 @@
    4.15  #define DIRECTSOUND_VERSION 0x0500
    4.16  #define DIRECTINPUT_VERSION 0x0700
    4.17  
    4.18 -#ifdef __GNUC__
    4.19 -#define NONAMELESSUNION
    4.20 -#endif
    4.21  #include <ddraw.h>
    4.22  #include <dsound.h>
    4.23  #include <dinput.h>