zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
cutealien 2015-08-26 21:04:11 +00:00
parent 125e73ef55
commit acd601edbc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes.txt
View File

@ -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)

2
include/irrpack.h
View File

@ -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