diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-05 06:10:16 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-08-05 06:10:16 +0000 |
| commit | 771947f7607661e13357caebb7c2b27dc474be88 (patch) | |
| tree | 5f6fa6ac96082df8d29f43504965c405cf7afaa2 /plugins/Zlib/src/gzguts.h | |
| parent | cfe8ca0a75ce9dcb2044e6e17f40b294f35d6366 (diff) | |
zlib update to 1.2.8
git-svn-id: http://svn.miranda-ng.org/main/trunk@5582 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Zlib/src/gzguts.h')
| -rw-r--r-- | plugins/Zlib/src/gzguts.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/plugins/Zlib/src/gzguts.h b/plugins/Zlib/src/gzguts.h index ee3f281aa5..d87659d031 100644 --- a/plugins/Zlib/src/gzguts.h +++ b/plugins/Zlib/src/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 */ |