From 5cf71b406eeefc29a5f850b2d587b9d8b170ba4c Mon Sep 17 00:00:00 2001 From: orbea Date: Fri, 14 Jan 2022 08:26:15 -0800 Subject: [PATCH] gb.h: Silence -Wembedded-directive warnings with -pedantic gb.h:400:2: warning: embedding a directive within macro arguments has undefined behavior [-Wembedded-directive] \#ifdef GB_BIG_ENDIAN ^ gb.h:410:2: warning: embedding a directive within macro arguments has undefined behavior [-Wembedded-directive] \#endif ^ --- Core/gb.h | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/Core/gb.h b/Core/gb.h index 1b444d4..3fec460 100644 --- a/Core/gb.h +++ b/Core/gb.h @@ -44,6 +44,11 @@ #error Unable to detect endianess #endif +#ifdef GB_BIG_ENDIAN +#define GB_REGISTER_ORDER a,f,b,c,d,e,h,l; +#else +#define GB_REGISTER_ORDER f,a,c,b,e,d,l,h; +#endif typedef struct { struct GB_color_s { @@ -335,17 +340,7 @@ typedef union { pc; }; struct { -#ifdef GB_BIG_ENDIAN - uint8_t a, f, - b, c, - d, e, - h, l; -#else - uint8_t f, a, - c, b, - e, d, - l, h; -#endif + uint8_t GB_REGISTER_ORDER }; } GB_registers_t; @@ -383,17 +378,7 @@ struct GB_gameboy_internal_s { pc; }; struct { -#ifdef GB_BIG_ENDIAN - uint8_t a, f, - b, c, - d, e, - h, l; -#else - uint8_t f, a, - c, b, - e, d, - l, h; -#endif + uint8_t GB_REGISTER_ORDER }; }; uint8_t ime;