Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '6d630bec50fe7767296b0e5184a9c6c7b915df24' into contrib

Browse Source
This commit is contained in:
Léo Terziman
2014-01-17 11:57:45 +01:00
parent ec3ef0c9d6 6d630bec50
commit 41175dacca
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/assimp/Compiler/pushpack1.h
+6 -1
View File
@@ -8,6 +8,7 @@
// MSVC 7,8,9
// GCC
// BORLAND (complains about 'pack state changed but not reverted', but works)
// Clang
//
//
// USAGE:
@@ -25,7 +26,11 @@
# pragma pack(push,1)
# define PACK_STRUCT
#elif defined( __GNUC__ )
# define PACK_STRUCT __attribute__((gcc_struct, __packed__))
# if defined(__clang__)
# define PACK_STRUCT __attribute__((__packed__))
# else
# define PACK_STRUCT __attribute__((gcc_struct, __packed__))
# endif
#else
# error Compiler not supported
#endif