Merge branch 'master' of https://github.com/serge-rgb/stb into working

Conflicts: stb_image_write.h
ago%!(EXTRA string=9 years) · b9216ddb36
parent 472c4c82a4 b372a1f86c
commit b9216ddb36
1 changed files with 6 additions and 1 deletions
--- a/stb_image_write.h
+++ b/stb_image_write.h
@ -99,6 +99,7 @@ CREDITS:
      Guillaume Chereau
      github:jry2
      github:romigrou
+      Sergio Gonzalez
      
 LICENSE

@ -145,9 +146,13 @@ STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w,
 #ifdef STB_IMAGE_WRITE_IMPLEMENTATION

 #ifdef _WIN32
+   #ifndef _CRT_SECURE_NO_WARNINGS
   #define _CRT_SECURE_NO_WARNINGS
+   #endif
+   #ifndef _CRT_NONSTDC_NO_DEPRECATE
   #define _CRT_NONSTDC_NO_DEPRECATE
   #endif
+#endif

 #ifndef STBI_WRITE_NO_STDIO
 #include <stdio.h>