Still trying to get rid of the warnings on the CDash machine. It's tricky because I'm not seeing the locally and the warning supression seems to vary bewteen vesions of GCC (See: http://dbp-consulting.com/tutorials/SuppressingGCCWarnings.html).

This commit is contained in:
David Williams 2013-03-01 16:07:50 +01:00
parent c28fa9a0ca
commit a7e49a1394
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,14 @@
/*
* CHANGES FOR POLYVOX
* -------------------
* This file gave compiler warnings on certain versions of GCC (at least version 4.3.5 used by out build machine)
* and I did not want to risk tampering with the code to fix them.Therefore the only difference between this file
* and the official 'miniz.c' is the pragma below which disables warnings for this file in GCC.
*/
#ifdef __GNUC__
#pragma GCC system_header
#endif
/* miniz.c v1.14 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing /* miniz.c v1.14 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing
See "unlicense" statement at the end of this file. See "unlicense" statement at the end of this file.
Rich Geldreich <richgel99@gmail.com>, last updated May 20, 2012 Rich Geldreich <richgel99@gmail.com>, last updated May 20, 2012

View File

@ -16,8 +16,6 @@
// For some unknown reason the miniz library is supplied only as a // For some unknown reason the miniz library is supplied only as a
// single .c file without a header. Apparently the only way to use // single .c file without a header. Apparently the only way to use
// it is then to #include it directly which is what the examples do. // it is then to #include it directly which is what the examples do.
// We also disable some warnings as I don't want to fix external code.
#pragma GCC diagnostic ignored "-Wall"
#include "PolyVoxCore/Impl/miniz.c" #include "PolyVoxCore/Impl/miniz.c"