summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/zlib/test/minigzip.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2017-01-02 14:01:23 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2017-01-02 14:01:23 +0100
commite984b7b5b7891c90611ca73f11fcddfbdf380226 (patch)
treebaf12d9bd77f89f4b4c442cc37d17d1dd3739275 /3rdparty/zlib/test/minigzip.c
parent9340a2c362b4eebd25be406f5b646d33d476c41d (diff)
Updated to zlib 1.2.9 (nw)
Diffstat (limited to '3rdparty/zlib/test/minigzip.c')
-rw-r--r--3rdparty/zlib/test/minigzip.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/3rdparty/zlib/test/minigzip.c b/3rdparty/zlib/test/minigzip.c
index b3025a489a9..e22fb08c0a2 100644
--- a/3rdparty/zlib/test/minigzip.c
+++ b/3rdparty/zlib/test/minigzip.c
@@ -1,5 +1,5 @@
/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -40,7 +40,7 @@
# define SET_BINARY_MODE(file)
#endif
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
# define snprintf _snprintf
#endif
@@ -156,14 +156,14 @@ void *myalloc(q, n, m)
void *q;
unsigned n, m;
{
- q = Z_NULL;
+ (void)q;
return calloc(n, m);
}
void myfree(q, p)
void *q, *p;
{
- q = Z_NULL;
+ (void)q;
free(p);
}
@@ -333,7 +333,7 @@ const char *gzerror(gz, err)
#endif
-char *prog;
+static char *prog;
void error OF((const char *msg));
void gz_compress OF((FILE *in, gzFile out));
@@ -500,7 +500,7 @@ void file_uncompress(file)
char *infile, *outfile;
FILE *out;
gzFile in;
- size_t len = strlen(file);
+ unsigned len = strlen(file);
if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
fprintf(stderr, "%s: filename too long\n", prog);