Branimir Karadžić 10 лет назад
Родитель
Сommit
f9c059d408
2 измененных файлов с 9 добавлено и 0 удалено
  1. 7 0
      3rdparty/stb/stb_image.c
  2. 2 0
      3rdparty/stb/stb_truetype.h

+ 7 - 0
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
 

+ 2 - 0
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