X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=include%2Firrpack.h;h=6ee1113fa8eefadf3de06c943c14e3b73e32f4b2;hb=8efd4527f6553747384858da420bfab53c23e1e5;hp=ff922d06f9749fcff26db5cc8fb90b809d44b678;hpb=2ae2a551a6290f46734307bbfdafea4b1a2cf2ba;p=irrlicht.git diff --git a/include/irrpack.h b/include/irrpack.h index ff922d0..6ee1113 100644 --- a/include/irrpack.h +++ b/include/irrpack.h @@ -13,26 +13,13 @@ // in between! // byte-align structures -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) +#if defined(_MSC_VER) # pragma warning(disable: 4103) # pragma pack( push, packing ) # pragma pack( 1 ) # define PACK_STRUCT -#elif defined( __DMC__ ) -# pragma pack( push, 1 ) -# define PACK_STRUCT #elif defined( __GNUC__ ) - // Using pragma pack might work with earlier gcc versions already, but - // it started to be necessary with gcc 4.7 on mingw unless compiled with -mno-ms-bitfields. - // And I found some hints on the web that older gcc versions on the other hand had sometimes - // trouble with pragma pack while they worked with __attribute__((packed)). -# if (__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7)) -# pragma pack( push, packing ) -# pragma pack( 1 ) -# define PACK_STRUCT -# else -# define PACK_STRUCT __attribute__((packed)) - #endif +# define PACK_STRUCT __attribute__((packed)) #else # error compiler not supported #endif