From e196edc9890efc499527ad17f5a556fc693cb1ba Mon Sep 17 00:00:00 2001 From: Triang3l Date: Sun, 8 Nov 2020 19:41:34 +0300 Subject: [PATCH] [Base] Use the original XEPACKEDSTRUCT/UNION names on MSVC --- src/xenia/base/platform.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/xenia/base/platform.h b/src/xenia/base/platform.h index 33083a831..9b98175c5 100644 --- a/src/xenia/base/platform.h +++ b/src/xenia/base/platform.h @@ -76,14 +76,12 @@ #endif // XE_PLATFORM_MAC #if XE_COMPILER_MSVC -#define XEPACKEDSTRUCT(name, value) \ - __pragma(pack(push, 1)) struct name##_s value __pragma(pack(pop)); \ - typedef struct name##_s name; +#define XEPACKEDSTRUCT(name, value) \ + __pragma(pack(push, 1)) struct name value __pragma(pack(pop)); #define XEPACKEDSTRUCTANONYMOUS(value) \ __pragma(pack(push, 1)) struct value __pragma(pack(pop)); -#define XEPACKEDUNION(name, value) \ - __pragma(pack(push, 1)) union name##_s value __pragma(pack(pop)); \ - typedef union name##_s name; +#define XEPACKEDUNION(name, value) \ + __pragma(pack(push, 1)) union name value __pragma(pack(pop)); #else #define XEPACKEDSTRUCT(name, value) struct __attribute__((packed)) name value; #define XEPACKEDSTRUCTANONYMOUS(value) struct __attribute__((packed)) value;