From 9b99265a5eea185c364724036ae55e7daaf25ee8 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 19 Jan 2017 20:19:37 -0800 Subject: [PATCH] Fixed mingw64 32-bit build, which does have the correct structure definitions --- src/audio/winmm/SDL_winmm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/audio/winmm/SDL_winmm.c b/src/audio/winmm/SDL_winmm.c index 908c37e176466..71a5dc95528ae 100644 --- a/src/audio/winmm/SDL_winmm.c +++ b/src/audio/winmm/SDL_winmm.c @@ -33,8 +33,8 @@ #include "../SDL_audio_c.h" #include "SDL_winmm.h" -/*====== WORKAROUND for MinGW's WinAPI header where those structures are being missed ======*/ -#if defined(__MINGW32__) && !defined(__MINGW64__) +/* MinGW32 mmsystem.h doesn't include these structures */ +#if defined(__MINGW32__) && defined(_MMSYSTEM_H) typedef struct tagWAVEINCAPS2W { @@ -65,8 +65,7 @@ typedef struct tagWAVEOUTCAPS2W GUID NameGuid; } WAVEOUTCAPS2W,*PWAVEOUTCAPS2W,*NPWAVEOUTCAPS2W,*LPWAVEOUTCAPS2W; -#endif /* defined(__MINGW32__) && !defined(__MINGW64__) */ -/*==========================================================================================*/ +#endif /* defined(__MINGW32__) && defined(_MMSYSTEM_H) */ #ifndef WAVE_FORMAT_IEEE_FLOAT #define WAVE_FORMAT_IEEE_FLOAT 0x0003