diff options
| author | shennetsind <ind@henn.et> | 2014-01-24 18:18:39 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-01-24 18:18:39 -0200 |
| commit | 2263dc4660c6668c373f6a9e654e21bea8c419e4 (patch) | |
| tree | 5a02d740a74d75979e6adee90acd4d63fe807036 /src/map/packets_struct.h | |
| parent | 7438e401b4209198691d3c8ca65b6c702338fa41 (diff) | |
| parent | 8fb2b31e8de73872baddc3d983a4eea5c359329d (diff) | |
| download | hercules-2263dc4660c6668c373f6a9e654e21bea8c419e4.tar.gz hercules-2263dc4660c6668c373f6a9e654e21bea8c419e4.tar.bz2 hercules-2263dc4660c6668c373f6a9e654e21bea8c419e4.tar.xz hercules-2263dc4660c6668c373f6a9e654e21bea8c419e4.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/packets_struct.h')
| -rw-r--r-- | src/map/packets_struct.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 8f0989f3d..1156f4465 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -205,7 +205,9 @@ enum packet_headers { npcmarketopenType = 0x9d5, }; +#if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(push, 1) +#endif // not NetBSD < 6 / Solaris /** * structs for data @@ -939,6 +941,8 @@ struct packet_npc_market_open { } list[1000];/* TODO: whats the actual max of this? */ } __attribute__((packed)); +#if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) +#endif // not NetBSD < 6 / Solaris #endif /* _PACKETS_STRUCT_H_ */ |