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

src/include/86box/plat_fallthrough.h

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

src/include/86box/plat_unused.h

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