joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-08 02:53:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5667 from maron2000/fix_mingw32error

Browse Source 
Fix definition of __inline__ macro for MinGW32
This commit is contained in:
Jonathan Campbell 2025-04-28 20:24:33 -07:00 committed by GitHub
commit 3db0d22e3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dos/cdrom_image.cpp
View File

@ -46,6 +46,12 @@
#include "logging.h"
#include "support.h"
#include "setup.h"
#ifdef __MINGW32__
#ifndef __MINGW64__
#pragma push_macro("__inline__")
#endif
#endif
#include "src/libs/decoders/audio_convert.c"
#include "src/libs/decoders/SDL_sound.c"
#include "src/libs/decoders/vorbis.c"
@ -55,6 +61,11 @@
#include "src/libs/decoders/mp3_seek_table.cpp"
#include "src/libs/decoders/mp3.cpp"
#include "src/libs/decoders/dr_flac.h"
#ifdef __MINGW32__
#ifndef __MINGW64__
#pragma pop_macro("__inline__")
#endif
#endif
#include "src/libs/libchdr/chd.h"
#include "src/libs/libchdr/libchdr_chd.c"
#include "src/libs/libchdr/libchdr_cdrom.c"