diff options
| author | Matthias Klose <doko@ubuntu.com> | 2015-11-23 20:27:57 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2015-11-23 20:27:57 +0000 |
| commit | cd9ec14217a566fa0ae12ccf34534cbb7680f5ab (patch) | |
| tree | c0867a0d04452190fa29a7e38ad632c37d5221cd /zlib/gzguts.h | |
| parent | 4c93660449ea23e5eee1f8ce3e97129c7974b7fc (diff) | |
| download | gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.zip gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.tar.gz gcc-cd9ec14217a566fa0ae12ccf34534cbb7680f5ab.tar.bz2 | |
2015-11-23 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.8; merged local changes.
From-SVN: r230774
Diffstat (limited to 'zlib/gzguts.h')
| -rw-r--r-- | zlib/gzguts.h | 22 |
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 */ |