aboutsummaryrefslogtreecommitdiff
path: root/zlib/gzguts.h
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@adacore.com>2015-11-25 15:09:09 -0800
committerJoel Brobecker <brobecker@adacore.com>2015-11-25 15:14:47 -0800
commitda09a436519e8085d328a586c438b5b0a560924d (patch)
tree00c45547fe27ee944ef36f7260a241e9d287a17b /zlib/gzguts.h
parent74b03b91333ccbc8fa70647eca22062e902f797f (diff)
downloadbinutils-da09a436519e8085d328a586c438b5b0a560924d.zip
binutils-da09a436519e8085d328a586c438b5b0a560924d.tar.gz
binutils-da09a436519e8085d328a586c438b5b0a560924d.tar.bz2
Import zlib 1.2.8 with local change merged in.
ChangeLog: * zlib: Update to zlib 1.2.8 with local changes merged in.
Diffstat (limited to 'zlib/gzguts.h')
-rw-r--r--zlib/gzguts.h22
1 files changed, 19 insertions, 3 deletions
diff --git a/zlib/gzguts.h b/zlib/gzguts.h
index ee3f281..d87659d 100644
--- a/zlib/gzguts.h
+++ b/zlib/gzguts.h
@@ -1,5 +1,5 @@
/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -35,6 +35,13 @@
# include <io.h>
#endif
+#ifdef WINAPI_FAMILY
+# define open _open
+# define read _read
+# define write _write
+# define close _close
+#endif
+
#ifdef NO_DEFLATE /* for compatibility with old definition */
# define NO_GZCOMPRESS
#endif
@@ -60,7 +67,7 @@
#ifndef HAVE_VSNPRINTF
# ifdef MSDOS
/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
- but for now we just assume it doesn't. */
+ but for now we just assume it doesn't. */
# define NO_vsnprintf
# endif
# ifdef __TURBOC__
@@ -88,6 +95,14 @@
# 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
+ the result is assured to fit in the space provided */
+#ifdef _MSC_VER
+# define snprintf _snprintf
+#endif
+
#ifndef local
# define local static
#endif
@@ -127,7 +142,8 @@
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
#endif
-/* default i/o buffer size -- double this for output when reading */
+/* default i/o buffer size -- double this for output when reading (this and
+ twice this must be able to fit in an unsigned type) */
#define GZBUFSIZE 8192
/* gzip modes, also provide a little integrity check on the passed structure */