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

2021-03-21 16:59:28 -03:00
parent 99405a41b2 10cc122925
commit 70ae42e7a0
18 changed files with 40 additions and 38 deletions
--- a/src/sound/munt/Structures.h
+++ b/src/sound/munt/Structures.h
@@ -28,7 +28,7 @@ namespace MT32Emu {
 #define MT32EMU_MEMADDR(x) ((((x) & 0x7f0000) >> 2) | (((x) & 0x7f00) >> 1) | ((x) & 0x7f))
 #define MT32EMU_SYSEXMEMADDR(x) ((((x) & 0x1FC000) << 2) | (((x) & 0x3F80) << 1) | ((x) & 0x7f))

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #define  MT32EMU_ALIGN_PACKED __declspec(align(1))
 #else
 #define MT32EMU_ALIGN_PACKED __attribute__((packed))