Fixed compilation on mingw32.
authorEdgar Simo <bobbens@gmail.com>
Tue, 14 Oct 2008 18:28:28 +0000
changeset 2770 c3ff3d5d16f0
parent 2769 2a46b5912665
child 2771 15e69dc6fded
Fixed compilation on mingw32.
src/joystick/win32/SDL_dxjoystick.c
src/joystick/win32/SDL_dxjoystick_c.h
--- 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"
 
 
--- 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 <windows.h>
 
 #define DIRECTINPUT_VERSION 0x0700      /* Need version 7 for force feedback. */
-#define INITGUID
 #include <dinput.h>