summaryrefslogtreecommitdiff
path: root/cpan/Compress-Raw-Zlib/zlib-src/zutil.c
diff options
context:
space:
mode:
Diffstat (limited to 'cpan/Compress-Raw-Zlib/zlib-src/zutil.c')
-rw-r--r--cpan/Compress-Raw-Zlib/zlib-src/zutil.c31
1 files changed, 24 insertions, 7 deletions
diff --git a/cpan/Compress-Raw-Zlib/zlib-src/zutil.c b/cpan/Compress-Raw-Zlib/zlib-src/zutil.c
index 60d638b1a8..1eff158182 100644
--- a/cpan/Compress-Raw-Zlib/zlib-src/zutil.c
+++ b/cpan/Compress-Raw-Zlib/zlib-src/zutil.c
@@ -1,5 +1,5 @@
/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -85,11 +85,31 @@ uLong ZEXPORT zlibCompileFlags()
#ifdef FASTEST
flags += 1L << 21;
#endif
-#ifdef Z_SOLO
- return flags;
+#ifdef STDC
+# 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
- return flags + gzflags();
+ 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;
}
#ifdef DEBUG
@@ -161,7 +181,6 @@ void ZLIB_INTERNAL zmemzero(
}
#endif
-#ifndef Z_SOLO
#ifdef SYS16BIT
@@ -297,5 +316,3 @@ void ZLIB_INTERNAL zcfree (
}
#endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */