summaryrefslogtreecommitdiff
path: root/include/text.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-07-20 12:11:46 -0400
committerGitHub <noreply@github.com>2019-07-20 12:11:46 -0400
commit4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (patch)
treeec2e9ec5f3e4a6d8523e80ab58e6c9c296fbc05c /include/text.h
parent3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff)
parent6edacdee36d31b2df69559f28a33b8d9e958bf5e (diff)
Merge pull request #732 from PikalaxALT/modern_gcc
Modernize code for compatibility with later releases of GCC
Diffstat (limited to 'include/text.h')
-rw-r--r--include/text.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/text.h b/include/text.h
index eba3d0c4e..d3ff663bb 100644
--- a/include/text.h
+++ b/include/text.h
@@ -166,7 +166,11 @@ struct TextPrinter
void (*callback)(struct TextPrinterTemplate *, u16); // 0x10
- union __attribute__((packed)) {
+ union
+#if !MODERN
+ __attribute__((packed))
+#endif
+ {
struct TextPrinterSubStruct sub;
u8 fields[7];
} subUnion;