diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2016-12-30 17:13:31 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2016-12-30 17:13:31 -0800 |
commit | 79b5c5acf0dff798f3436126b080472ef6b7bd65 (patch) | |
tree | d82603b72c81decc752819cc8079bb9cd40ea324 | |
parent | ee7d7b5dda25c111e61e19ac7b476c26aa6f3020 (diff) | |
download | zlib-79b5c5acf0dff798f3436126b080472ef6b7bd65.tar.gz |
Use snprintf() for later versions of Microsoft C.
-rw-r--r-- | gzguts.h | 7 | ||||
-rw-r--r-- | test/minigzip.c | 2 |
2 files changed, 4 insertions, 5 deletions
@@ -103,11 +103,10 @@ # endif #endif -/* unlike snprintf (which is required in C99, yet still not supported by - Microsoft more than a decade later!), _snprintf does not guarantee null - termination of the result -- however this is only used in gzlib.c where +/* unlike snprintf (which is required in C99), _snprintf does not guarantee + null 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 diff --git a/test/minigzip.c b/test/minigzip.c index 6c64cc7..26c44ff 100644 --- 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 |