Fixed bug #943 SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Wed, 10 Mar 2010 15:04:13 +0000
branchSDL-1.2
changeset 4430 eada7e321df6
parent 4423 e5bdd0a79e5e
Fixed bug #943 Ozkan Sezer 2010-02-06 12:31:06 PST Hi: Here are some small fixes for compiling SDL against mingw-w64. (see http://mingw-w64.sourceforge.net/ . Despite the name, it supports both win32 and win64.) Two patches, one for SDL-1.2 and one for SDL-1.3 attached. src/audio/windx5/directx.h and src/video/windx5/directx.h (both SDL-1.2 and SDL-1.3.) I get compilation errors about some union not having a member named u1 and alike, because of other system headers being included before this one and them already defining DUMMYUNIONNAME and stuff. This header probably assumes that those stuff are defined in windef.h, but mingw-w64 headers define them in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to include the header before SDL_video.h to avoid the same problem. src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) : The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric because _beginthreadex returns uintptr_t, not unsigned long which is 32 bits in win64. Changing the return type to uintptr_t fixes it. Hope these are useful. Thanks.
src/audio/windx5/directx.h
src/thread/win32/SDL_systhread.c
src/video/windx5/SDL_dx5yuv.c
src/video/windx5/directx.h
--- a/src/audio/windx5/directx.h	Sun Feb 28 23:45:02 2010 -0800
+++ b/src/audio/windx5/directx.h	Wed Mar 10 15:04:13 2010 +0000
@@ -2,6 +2,10 @@
 #ifndef _directx_h
 #define _directx_h
 
+#ifdef __GNUC__
+#define NONAMELESSUNION
+#endif
+
 /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
 
 #define WIN32_LEAN_AND_MEAN
@@ -74,9 +78,6 @@
 #define DIRECTSOUND_VERSION 0x0500
 #define DIRECTINPUT_VERSION 0x0500
 
-#ifdef __GNUC__
-#define NONAMELESSUNION
-#endif
 #include <ddraw.h>
 #include <dsound.h>
 #include <dinput.h>
--- a/src/thread/win32/SDL_systhread.c	Sun Feb 28 23:45:02 2010 -0800
+++ b/src/thread/win32/SDL_systhread.c	Wed Mar 10 15:04:13 2010 +0000
@@ -37,7 +37,7 @@
 #endif
 
 #if __GNUC__
-typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
+typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
         unsigned (__stdcall *func)(void *), void *arg, 
         unsigned, unsigned *threadID);
 typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
--- a/src/video/windx5/SDL_dx5yuv.c	Sun Feb 28 23:45:02 2010 -0800
+++ b/src/video/windx5/SDL_dx5yuv.c	Wed Mar 10 15:04:13 2010 +0000
@@ -22,7 +22,7 @@
 #include "SDL_config.h"
 
 /* This is the DirectDraw implementation of YUV video overlays */
-
+#include "directx.h"
 #include "SDL_video.h"
 #include "SDL_dx5yuv_c.h"
 #include "../SDL_yuvfuncs.h"
--- a/src/video/windx5/directx.h	Sun Feb 28 23:45:02 2010 -0800
+++ b/src/video/windx5/directx.h	Wed Mar 10 15:04:13 2010 +0000
@@ -2,6 +2,10 @@
 #ifndef _directx_h
 #define _directx_h
 
+#ifdef __GNUC__
+#define NONAMELESSUNION
+#endif
+
 /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
 
 #define WIN32_LEAN_AND_MEAN
@@ -74,9 +78,6 @@
 #define DIRECTSOUND_VERSION 0x0500
 #define DIRECTINPUT_VERSION 0x0700
 
-#ifdef __GNUC__
-#define NONAMELESSUNION
-#endif
 #include <ddraw.h>
 #include <dsound.h>
 #include <dinput.h>