diff options
| author | delphij <delphij@FreeBSD.org> | 2012-06-19 05:48:36 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-06-19 05:48:36 +0000 |
| commit | 5ecec51ae55e160069af12ac1c8fb3c4612e498d (patch) | |
| tree | 65f97a778a7643891e5d3b1724fd3e6f5acd6279 /gzguts.h | |
| parent | abe1867d4b382885366b62572cee3a8ca4b7565b (diff) | |
| download | FreeBSD-src-5ecec51ae55e160069af12ac1c8fb3c4612e498d.zip FreeBSD-src-5ecec51ae55e160069af12ac1c8fb3c4612e498d.tar.gz | |
Vendor import of zlib 1.2.7.
Diffstat (limited to 'gzguts.h')
| -rw-r--r-- | gzguts.h | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -12,7 +12,7 @@ # endif #endif -#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) +#ifdef HAVE_HIDDEN # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) #else # define ZLIB_INTERNAL @@ -27,7 +27,11 @@ #endif #include <fcntl.h> -#ifdef __TURBOC__ +#ifdef _WIN32 +# include <stddef.h> +#endif + +#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) # include <io.h> #endif @@ -66,7 +70,6 @@ /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ # if !defined(vsnprintf) && !defined(NO_vsnprintf) # if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) -# include <io.h> # define vsnprintf _vsnprintf # endif # endif @@ -101,7 +104,7 @@ # include <windows.h> # define zstrerror() gz_strwinerror((DWORD)GetLastError()) #else -# ifdef STDC +# ifndef NO_STRERROR # include <errno.h> # define zstrerror() strerror(errno) # else |
