From 484efd9b778c08bca9d5e57281e2200f3c0924c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Tue, 19 Aug 2014 20:21:17 -0700 Subject: [PATCH] Fixed fcpp warning. Disabled warnings in glsl-optimizer. --- 3rdparty/fcpp/cpp6.c | 1 + 3rdparty/glsl-optimizer/include/c99_compat.h | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/3rdparty/fcpp/cpp6.c b/3rdparty/fcpp/cpp6.c index a43a686d..1731c797 100644 --- a/3rdparty/fcpp/cpp6.c +++ b/3rdparty/fcpp/cpp6.c @@ -481,6 +481,7 @@ char *savestring(struct Global *global, char *text) /* * Store a string into free memory. */ + (void)global; // BK - not used but causes warning. char *result; result = malloc(strlen(text) + 1); diff --git a/3rdparty/glsl-optimizer/include/c99_compat.h b/3rdparty/glsl-optimizer/include/c99_compat.h index 66ee1eba..95f4788f 100644 --- a/3rdparty/glsl-optimizer/include/c99_compat.h +++ b/3rdparty/glsl-optimizer/include/c99_compat.h @@ -64,6 +64,17 @@ # include # undef _CRTRESTRICT # define _CRTRESTRICT +#else +// BK - STFU! +# pragma GCC diagnostic ignored "-Wformat=" +# pragma GCC diagnostic ignored "-Wformat-extra-args" +# pragma GCC diagnostic ignored "-Wignored-qualifiers" +# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +# pragma GCC diagnostic ignored "-Wmissing-field-initializers" +# pragma GCC diagnostic ignored "-Wreorder" +# pragma GCC diagnostic ignored "-Wsign-compare" +# pragma GCC diagnostic ignored "-Wunused-parameter" +# pragma GCC diagnostic ignored "-Wunused-variable" #endif