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

Fix build error in Linux due to confilct in __inline__ macro

Browse Source
This commit is contained in:
maron2000
2025-05-09 09:30:32 +09:00
parent d7ba3937a9
commit dfc4676d3f
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dos/cdrom_image.cpp
View File

@@ -47,11 +47,9 @@
#include "support.h"
#include "setup.h"
#ifdef __MINGW32__
#ifndef __MINGW64__
#if (defined( __MINGW32__) && !defined(__MINGW64__ )) || defined(LINUX)
#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"
@@ -61,11 +59,9 @@
#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__
#if (defined( __MINGW32__) && !defined(__MINGW64__ )) || defined(LINUX)
#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"