v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

pull/2208/head
Kim Kulling 2018-11-08 19:23:00 +01:00 committed by GitHub
parent 97450fcb55 131cfe2b1e
commit a4154a3fcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/assimp/Compiler/pushpack1.h
View File

@ -25,7 +25,7 @@
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__) #if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__BCPLUSPLUS__)
# pragma pack(push,1) # pragma pack(push,1)
# define PACK_STRUCT # define PACK_STRUCT
#elif defined( __GNUC__ ) #elif defined( __GNUC__ ) || defined(__clang__)
# if !defined(HOST_MINGW) # if !defined(HOST_MINGW)
# define PACK_STRUCT __attribute__((__packed__)) # define PACK_STRUCT __attribute__((__packed__))
# else # else