From 7381d7b92fa21cce3c086cb01199036053687078 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sun, 23 Aug 2020 02:22:23 +0200 Subject: [PATCH] Remove unnecessarily nested symbol data union --- include/asm/symbol.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/include/asm/symbol.h b/include/asm/symbol.h index e2beda47..5efdc150 100644 --- a/include/asm/symbol.h +++ b/include/asm/symbol.h @@ -40,18 +40,16 @@ struct Symbol { bool hasCallback; union { - union { /* Otherwise */ - /* If sym_IsNumeric */ - int32_t value; - int32_t (*numCallback)(void); - /* For SYM_MACRO */ - struct { - size_t macroSize; - char *macro; - }; - /* For SYM_EQUS, TODO: separate "base" fields from SYM_MACRO */ - char const *(*strCallback)(void); /* For SYM_EQUS */ + /* If sym_IsNumeric */ + int32_t value; + int32_t (*numCallback)(void); + /* For SYM_MACRO */ + struct { + size_t macroSize; + char *macro; }; + /* For SYM_EQUS, TODO: separate "base" fields from SYM_MACRO */ + char const *(*strCallback)(void); /* For SYM_EQUS */ }; uint32_t ID; /* ID of the symbol in the object file (-1 if none) */