summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpixel <pixel>2004-12-27 18:48:25 +0000
committerpixel <pixel>2004-12-27 18:48:25 +0000
commit248102902168025dbdd1ee618ade6bd0d85a5723 (patch)
treea2044559c3103a9544182601ca04e89daf617c01
parent59c81e2d1e640b56db41bc5a7b17ae6f2f201b01 (diff)
msvc HAS some nprintfs.... yes, it does.
-rw-r--r--include/generic.h4
-rw-r--r--lib/zlib/src/gzio.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/include/generic.h b/include/generic.h
index fe9b529..4f71654 100644
--- a/include/generic.h
+++ b/include/generic.h
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: generic.h,v 1.31 2004-11-27 21:46:03 pixel Exp $ */
+/* $Id: generic.h,v 1.32 2004-12-27 18:49:30 pixel Exp $ */
#ifndef __GENERIC_H__
#define __GENERIC_H__
@@ -34,6 +34,8 @@
#ifdef _WIN32
#include <windows.h>
+#define vsnprintf _vsnprintf
+#define snprintf _snprintf
#endif
#ifndef bcopy
diff --git a/lib/zlib/src/gzio.c b/lib/zlib/src/gzio.c
index 3f534f6..f3c0da2 100644
--- a/lib/zlib/src/gzio.c
+++ b/lib/zlib/src/gzio.c
@@ -5,7 +5,7 @@
* Compile this file with -DNO_DEFLATE to avoid the compression code.
*/
-/* @(#) $Id: gzio.c,v 1.5 2004-11-27 21:46:13 pixel Exp $ */
+/* @(#) $Id: gzio.c,v 1.6 2004-12-27 18:48:25 pixel Exp $ */
#include <stdio.h>
@@ -529,11 +529,7 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
int len;
va_start(va, format);
-#ifdef HAS_vsnprintf
(void)vsnprintf(buf, sizeof(buf), format, va);
-#else
- (void)vsprintf(buf, format, va);
-#endif
va_end(va);
len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
if (len <= 0) return 0;