Changeset 133 for smplayer/vendor/current/zlib/zutil.c

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 )
• zutil.c (modified) (3 diffs)

smplayer/vendor/current/zlib/zutil.c

@@ -1 +1 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -7 +7 @@
 
 #include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
 
 #ifndef NO_DUMMY_DECL
@@ -86 +89 @@
     flags += 1L << 21;
 #endif
-#ifdef Z_SOLO
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifdef NO_vsnprintf
+    flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#else
+    flags += 1L << 24;
+#  ifdef NO_snprintf
+    flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#endif
     return flags;
-#else
-    return flags + gzflags();
-#endif
 }