diff options
author | SatoMew <SatoMew@users.noreply.github.com> | 2019-08-04 20:35:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-04 20:35:38 +0100 |
commit | 667f0837e2c0fecb03e4198a182cf04624a47fbd (patch) | |
tree | 4f11ff910478fdb34a4c40c465b30be2ac1a22da /include/text.h | |
parent | 89da828794d036e33ef313ab95868c8be6bb039f (diff) | |
parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) |
Merge branch 'master' into master
Diffstat (limited to 'include/text.h')
-rw-r--r-- | include/text.h | 6 |
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; |