mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of cane:bkaradzic/bgfx into dev

This commit is contained in:
Branimir Karadžić 2016-01-19 22:08:58 -08:00
parent 1e139d2f13 8323063e81
commit 11d023414c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/stb/stb_image.c vendored
View File

@ -1,5 +1,6 @@
#ifdef __GNUC__ #ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wshadow" # pragma GCC diagnostic ignored "-Wshadow"
# pragma GCC diagnostic ignored "-Warray-bounds"
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# pragma warning(disable:4312) // warning C4312: 'type cast': conversion from '' to '' of greater size # pragma warning(disable:4312) // warning C4312: 'type cast': conversion from '' to '' of greater size
# pragma warning(disable:4456) // warning C4456: declaration of 'k' hides previous local declaration # pragma warning(disable:4456) // warning C4456: declaration of 'k' hides previous local declaration