Use snprintf() for later versions of Microsoft C.

79b5c5ac · Mark Adler · ee7d7b5d · 79b5c5ac · 79b5c5ac
隐藏空白更改
内联并排

Showing with 4 addition and 5 deletion

gzguts.h gzguts.h +3 -4

test/minigzip.c test/minigzip.c +1 -1

未找到文件。
--- a/gzguts.h
+++ b/gzguts.h
@@ -103,11 +103,10 @@
 #  endif
 #endif
-/* unlike snprintf (which is required in C99, yet still not supported by
+/* unlike snprintf (which is required in C99), _snprintf does not guarantee
-   Microsoft more than a decade later!), _snprintf does not guarantee null
+   null termination of the result -- however this is only used in gzlib.c where
-   termination of the result -- however this is only used in gzlib.c where
   the result is assured to fit in the space provided */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #  define snprintf _snprintf
 #endif

--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -40,7 +40,7 @@
 #  define SET_BINARY_MODE(file)
 #endif
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #  define snprintf _snprintf
 #endif