# HG changeset patch # User Edgar Simo # Date 1224008908 0 # Node ID c3ff3d5d16f0351b2d4fee837629a3f044adad8e # Parent 2a46b5912665425fd4d34a07d36738ec0b2a4124 Fixed compilation on mingw32. diff -r 2a46b5912665 -r c3ff3d5d16f0 src/joystick/win32/SDL_dxjoystick.c --- a/src/joystick/win32/SDL_dxjoystick.c Sun Oct 12 16:30:42 2008 +0000 +++ b/src/joystick/win32/SDL_dxjoystick.c Tue Oct 14 18:28:28 2008 +0000 @@ -38,6 +38,7 @@ #include "SDL_joystick.h" #include "../SDL_sysjoystick.h" #include "../SDL_joystick_c.h" +#define INITGUID /* Only set here, if set twice will cause mingw32 to break. */ #include "SDL_dxjoystick_c.h" diff -r 2a46b5912665 -r c3ff3d5d16f0 src/joystick/win32/SDL_dxjoystick_c.h --- a/src/joystick/win32/SDL_dxjoystick_c.h Sun Oct 12 16:30:42 2008 +0000 +++ b/src/joystick/win32/SDL_dxjoystick_c.h Tue Oct 14 18:28:28 2008 +0000 @@ -37,7 +37,6 @@ #include #define DIRECTINPUT_VERSION 0x0700 /* Need version 7 for force feedback. */ -#define INITGUID #include