80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2023-08-24 17:00:20 +02:00
parent fc8b4ce828 6e03e1e8ba
commit cf4b7bbd42
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/plat_fallthrough.h
View File

@@ -18,6 +18,7 @@
#ifndef EMU_PLAT_FALLTHROUGH_H #ifndef EMU_PLAT_FALLTHROUGH_H
#define EMU_PLAT_FALLTHROUGH_H #define EMU_PLAT_FALLTHROUGH_H
#ifndef EMU_PLAT_H
#ifdef _MSC_VER #ifdef _MSC_VER
# define fallthrough do {} while (0) /* fallthrough */ # define fallthrough do {} while (0) /* fallthrough */
#else #else
@@ -30,5 +31,6 @@
# define fallthrough do {} while (0) /* fallthrough */ # define fallthrough do {} while (0) /* fallthrough */
# endif # endif
#endif #endif
#endif
#endif /*EMU_PLAT_FALLTHROUGH_H*/ #endif /*EMU_PLAT_FALLTHROUGH_H*/

2
src/include/86box/plat_unused.h
View File

@@ -21,11 +21,13 @@
#ifndef EMU_PLAT_UNUSED_H #ifndef EMU_PLAT_UNUSED_H
#define EMU_PLAT_UNUSED_H #define EMU_PLAT_UNUSED_H
#ifndef EMU_PLAT_H
#ifdef _MSC_VER #ifdef _MSC_VER
# define UNUSED(arg) arg # define UNUSED(arg) arg
#else #else
/* A hack (GCC-specific?) to allow us to ignore unused parameters. */ /* A hack (GCC-specific?) to allow us to ignore unused parameters. */
# define UNUSED(arg) __attribute__((unused)) arg # define UNUSED(arg) __attribute__((unused)) arg
#endif #endif
#endif
#endif /*EMU_PLAT_UNUSED_H*/ #endif /*EMU_PLAT_UNUSED_H*/