Browse Source

tests: avoid redefinition warnings for MSVC _CRT_???_NO_DEPRECATE macros

Ozkan Sezer 2 years ago
parent
commit
bcccbbd894
2 changed files with 7 additions and 4 deletions
  1. 4 0
      test/testautomation_surface.c
  2. 3 4
      test/testfile.c

+ 4 - 0
test/testautomation_surface.c

@@ -4,8 +4,12 @@
  */
  */
 
 
 /* Supress C4996 VS compiler warnings for unlink() */
 /* Supress C4996 VS compiler warnings for unlink() */
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 #define _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE
+#endif
+#if defined(_MSC_VER) && !defined(_CRT_NONSTDC_NO_DEPRECATE)
 #define _CRT_NONSTDC_NO_DEPRECATE
 #define _CRT_NONSTDC_NO_DEPRECATE
+#endif
 
 
 #include <stdio.h>
 #include <stdio.h>
 #ifndef _MSC_VER
 #ifndef _MSC_VER

+ 3 - 4
test/testfile.c

@@ -13,19 +13,18 @@
 /* sanity tests on SDL_rwops.c (usefull for alternative implementations of stdio rwops) */
 /* sanity tests on SDL_rwops.c (usefull for alternative implementations of stdio rwops) */
 
 
 /* quiet windows compiler warnings */
 /* quiet windows compiler warnings */
+#if defined(_MSC_VER) && !defined(_CRT_NONSTDC_NO_WARNINGS)
 #define _CRT_NONSTDC_NO_WARNINGS
 #define _CRT_NONSTDC_NO_WARNINGS
+#endif
 
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
-
 #ifndef _MSC_VER
 #ifndef _MSC_VER
 #include <unistd.h>
 #include <unistd.h>
 #endif
 #endif
 
 
 #include "SDL.h"
 #include "SDL.h"
 
 
-
-#include <stdio.h>
-
 /* WARNING ! those 2 files will be destroyed by this test program */
 /* WARNING ! those 2 files will be destroyed by this test program */
 
 
 #ifdef __IPHONEOS__
 #ifdef __IPHONEOS__