From acd601edbc31856ba77ab26f48fa63393c557820 Mon Sep 17 00:00:00 2001 From: cutealien Date: Wed, 26 Aug 2015 21:04:11 +0000 Subject: [PATCH] Merge branch releases/1.8 revisions 5104:5120 into trunk: - Fix compiling on GCC5 on MinGW git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5121 dfc29bdd-3216-0410-991c-e03cc46cb475 --- changes.txt | 1 + include/irrpack.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changes.txt b/changes.txt index 3a21dabc..53e796af 100644 --- a/changes.txt +++ b/changes.txt @@ -116,6 +116,7 @@ Changes in 1.9 (not yet released) -------------------------- Changes in 1.8.2 + - Fix compiling on GCC5 on MinGW (thannks to Slipxy for finding the bug and to osense for reporting it). - Fix loading of .X and .B3D models with non-normalized quaternion rotations (thanks to JLouisB for a test-model). - Fix compiling on Free BSD (thanks to leper for reporting and patch) - Fix bug with multiple SetPixelFormat calls. (reported and fixed by anontypist) diff --git a/include/irrpack.h b/include/irrpack.h index 3cf643f8..ff922d06 100644 --- a/include/irrpack.h +++ b/include/irrpack.h @@ -26,7 +26,7 @@ // 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_MINOR__ >= 7) +# if (__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7)) # pragma pack( push, packing ) # pragma pack( 1 ) # define PACK_STRUCT