From f9c059d408cfa6dcc69492d39910ab0debc5b28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 2 Oct 2015 16:23:24 -0700 Subject: [PATCH] Fixed vs2015 warnings. --- 3rdparty/stb/stb_image.c | 7 +++++++ 3rdparty/stb/stb_truetype.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/3rdparty/stb/stb_image.c b/3rdparty/stb/stb_image.c index e9b2a1d0..324d37cf 100644 --- a/3rdparty/stb/stb_image.c +++ b/3rdparty/stb/stb_image.c @@ -1,3 +1,10 @@ +#ifdef __GNUC__ +# pragma GCC diagnostic ignored "-Wshadow" +#elif defined(_MSC_VER) +# pragma warning(disable:4456) // warning C4456: declaration of 'k' hides previous local declaration +# pragma warning(disable:4457) // warning C4457: declaration of 'y' hides function parameter +#endif + /* stb_image - v2.06 - public domain image loader - http://nothings.org/stb_image.h no warranty implied; use at your own risk diff --git a/3rdparty/stb/stb_truetype.h b/3rdparty/stb/stb_truetype.h index d71eac7b..98f1319e 100644 --- a/3rdparty/stb/stb_truetype.h +++ b/3rdparty/stb/stb_truetype.h @@ -1,5 +1,7 @@ #ifdef __GNUC__ # pragma GCC diagnostic ignored "-Wshadow" +#elif defined(_MSC_VER) +# pragma warning(disable:4456) // warning C4456: declaration of 'k' hides previous local declaration #endif // stb_truetype.h - v1.07 - public domain