Changeset 133 for smplayer/vendor/current/zlib/gzguts.h

Timestamp:

Oct 24, 2012, 7:56:20 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMplayer: update vendor to 0.8.1

Location:

smplayer/vendor/current/zlib

Files:

• . (moved) (moved from smplayer/vendor/current/zlib-1.2.6 )
• gzguts.h (modified) (4 diffs)

smplayer/vendor/current/zlib/gzguts.h

@@ -13 +13 @@
 #endif
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
@@ -28 +28 @@
 #include <fcntl.h>
 
-#ifdef __TURBOC__
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
 #  include <io.h>
 #endif
@@ -67 +71 @@
 #    if !defined(vsnprintf) && !defined(NO_vsnprintf)
 #      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         include <io.h>
 #         define vsnprintf _vsnprintf
 #      endif
@@ -102 +105 @@
 #  define zstrerror() gz_strwinerror((DWORD)GetLastError())
 #else
-#  ifdef STDC
+#  ifndef NO_STRERROR
 #    include <errno.h>
 #    define zstrerror() strerror(errno)