Skip to content

Commit

Permalink
Fixed bug #943
Browse files Browse the repository at this point in the history
 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.
  • Loading branch information
slouken committed Mar 10, 2010
1 parent 252f9f8 commit 75172d2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
7 changes: 4 additions & 3 deletions src/audio/windx5/directx.h
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/thread/win32/SDL_systhread.c
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/video/windx5/SDL_dx5yuv.c
Expand Up @@ -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"
Expand Down
7 changes: 4 additions & 3 deletions src/video/windx5/directx.h
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 75172d2

Please sign in to comment.