diff options
| author | Ricardo Signes <rjbs@cpan.org> | 2012-03-13 21:01:00 -0400 |
|---|---|---|
| committer | Ricardo Signes <rjbs@cpan.org> | 2012-03-13 21:14:31 -0400 |
| commit | 30faa5652ea0cfe6248ed70f321dcfdf9cea7bcd (patch) | |
| tree | e88e20db9e33a43886723d6cf89250bb0819eaf9 /cpan/Compress-Raw-Zlib/zlib-src/zutil.c | |
| parent | cba8842c354197460eeef36ed34e9e904fc9836b (diff) | |
| download | perl-rjbs/revert-compress.tar.gz | |
Revert changes to compression librariesrjbs/revert-compress
Revert "Ran zlib2ansi script against zlib-src/ to fix K&R-isms"
This reverts commit a7026383bc5a2ca5f518f670ee6d74d55cd994aa.
Revert "Some files in cpan/Compress-Raw-Zlib have the x bit set."
This reverts commit adace0595a25c5339a4c1fff6b4704945abf8814.
Revert "Fixes type in commit 14c554185"
This reverts commit d588a46d9335dc093e4046b68ae0e2c7925ef095.
Revert "Upgrade Compress::Raw::Zlib to 2.051."
This reverts commit 14c554185b51c8646198cbf62fe6e94e9890b3a5.
Revert "Upgrade Compress-Raw-Bzip2 to version 2.049."
This reverts commit 616f340ab90cf805b145b81fd31c2017a4e7783f.
Revert "Upgrade cpan/Archive-Tar to 1.84"
This reverts commit c06ee8c824f270b42cb440453df0e44858492aed.
Revert "Upgrade Archive-Extract to 0.60"
This reverts commit dc16b9e468c516c95140dc2b6eac778872c79239.
Diffstat (limited to 'cpan/Compress-Raw-Zlib/zlib-src/zutil.c')
| -rw-r--r-- | cpan/Compress-Raw-Zlib/zlib-src/zutil.c | 31 |
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 */ |