diff options
Diffstat (limited to 'plugins/Zlib/gzguts.h')
-rw-r--r-- | plugins/Zlib/gzguts.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/Zlib/gzguts.h b/plugins/Zlib/gzguts.h index 4503cedfe6..ee3f281aa5 100644 --- a/plugins/Zlib/gzguts.h +++ b/plugins/Zlib/gzguts.h @@ -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 @@ -64,7 +68,6 @@ # endif # ifdef WIN32 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ -# include <io.h> # if !defined(vsnprintf) && !defined(NO_vsnprintf) # if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) # define vsnprintf _vsnprintf @@ -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 |