diff options
| author | Ries van Twisk <github@rvt.dds.nl> | 2020-01-02 11:10:58 +0100 |
|---|---|---|
| committer | Ries van Twisk <github@rvt.dds.nl> | 2020-01-02 11:10:58 +0100 |
| commit | 408ddfe68a5222ae0ccc9b749311a8ceab674305 (patch) | |
| tree | 429b13c1251ad4460934786502e693240648e945 | |
| parent | f0065732b9d8dfb3357196350660e06811002225 (diff) | |
| parent | 678ba1e120b033ee877f70c24913ff049a7f731f (diff) | |
Merge branch 'freepie-packed-struct' into osx-build-fix
| -rw-r--r-- | tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp index 6622a3b7..28d29351 100644 --- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp +++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp @@ -17,13 +17,21 @@ tracker_freepie::~tracker_freepie() } void tracker_freepie::run() { -#pragma pack(push, 1) - struct { +#ifndef __clang__ +#pragma pack(push) +struct +#else +struct __attribute__((packed)) +#endif +{ uint8_t pad1; uint8_t flags; float fl[12]; - } data {}; +} data; +#ifndef __clang__ #pragma pack(pop) +#endif + enum F { |