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

Fallthrough fixes for MSVC

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-08-15 19:36:39 -04:00
parent cc19bce7f2
commit ad3cca65f6
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/include/86box/plat.h
View File

@@ -55,15 +55,6 @@ extern int strnicmp(const char *s1, const char *s2, size_t n);
# define off64_t off_t # define off64_t off_t
#endif #endif
#if __has_attribute(fallthrough)
# define fallthrough __attribute__((fallthrough))
#else
# if __has_attribute(__fallthrough__)
# define fallthrough __attribute__((__fallthrough__))
# endif
# define fallthrough do {} while (0) /* fallthrough */
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
# define UNUSED(arg) arg # define UNUSED(arg) arg
#else #else
@@ -89,6 +80,19 @@ extern "C" {
# define ssize_t intptr_t # define ssize_t intptr_t
#endif #endif
#ifdef _MSC_VER
# define fallthrough do {} while (0) /* fallthrough */
#else
# if __has_attribute(fallthrough)
# define fallthrough __attribute__((fallthrough))
# else
# if __has_attribute(__fallthrough__)
# define fallthrough __attribute__((__fallthrough__))
# endif
# define fallthrough do {} while (0) /* fallthrough */
# endif
#endif
/* Global variables residing in the platform module. */ /* Global variables residing in the platform module. */
extern int dopause; /* system is paused */ extern int dopause; /* system is paused */
extern int mouse_capture; /* mouse is captured in app */ extern int mouse_capture; /* mouse is captured in app */

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

@@ -18,13 +18,17 @@
#ifndef EMU_PLAT_FALLTHROUGH_H #ifndef EMU_PLAT_FALLTHROUGH_H
#define EMU_PLAT_FALLTHROUGH_H #define EMU_PLAT_FALLTHROUGH_H
#if __has_attribute(__fallthrough__) #ifdef _MSC_VER
# define fallthrough __attribute__((__fallthrough__)) # define fallthrough do {} while (0) /* fallthrough */
#else #else
# if __has_attribute(fallthrough) # if __has_attribute(fallthrough)
# define fallthrough __attribute__((fallthrough)) # define fallthrough __attribute__((fallthrough))
# else
# if __has_attribute(__fallthrough__)
# define fallthrough __attribute__((__fallthrough__))
# endif # endif
# define fallthrough do {} while (0) /* fallthrough */ # define fallthrough do {} while (0) /* fallthrough */
# endif # endif
#endif
#endif /*EMU_PLAT_FALLTHROUGH_H*/ #endif /*EMU_PLAT_FALLTHROUGH_H*/