Further address Microsoft deprecation warnings.

2 files changed, 12 insertions, 5 deletions

diff --git a/test/example.c b/test/example.c
index e9cb806..d22e5f4 100644
--- a/test/example.c
+++ b/test/example.c
@@ -5,6 +5,10 @@
 
 /* @(#) $Id$ */
 
+#if defined(_WIN32) && !defined(_CRT_SECURE_NO_WARNINGS)
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
+
 #include "zlib.h"
 #include <stdio.h>
 
diff --git a/test/minigzip.c b/test/minigzip.c
index ec86e3f..541f371 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -19,6 +19,13 @@
 #  define _POSIX_C_SOURCE 200112L
 #endif
 
+#if defined(_WIN32) && !defined(_CRT_SECURE_NO_WARNINGS)
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
+#if defined(_WIN32) && !defined(_CRT_NONSTDC_NO_DEPRECATE)
+#  define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+
 #include "zlib.h"
 #include <stdio.h>
 
@@ -39,7 +46,7 @@
 #  ifdef UNDER_CE
 #    include <stdlib.h>
 #  endif
-#  define SET_BINARY_MODE(file) _setmode(_fileno(file), O_BINARY)
+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
 #else
 #  define SET_BINARY_MODE(file)
 #endif
@@ -58,10 +65,6 @@
 #if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
 #  include <unix.h> /* for fileno */
 #endif
-#ifdef WIN32
-#  define fileno _fileno
-#  define unlink _unlink
-#endif
 
 #if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
 #ifndef WIN32 /* unlink already in stdio.h for WIN32 */