Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2005-02-11 00:17:18 +0300
committerZoltan Varga <vargaz@gmail.com>2005-02-11 00:17:18 +0300
commit2b89f5e79252e86083fdce198f219b11d6261e25 (patch)
tree5e96db970df4be58429502de5d0cc3641d28ec54 /support
parent77814325b0b3b3239385c33ebdd41088d0938b28 (diff)
2005-02-10 Zoltan Varga <vargaz@freemail.hu>
* zlib_macros.c (create_z_stream): Explicitly check for older versions of zlib. svn path=/trunk/mono/; revision=40436
Diffstat (limited to 'support')
-rw-r--r--support/ChangeLog5
-rw-r--r--support/zlib_macros.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/support/ChangeLog b/support/ChangeLog
index 1efbde20e63..dffc19b20e9 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-10 Zoltan Varga <vargaz@freemail.hu>
+
+ * zlib_macros.c (create_z_stream): Explicitly check for older versions
+ of zlib.
+
2005-02-08 Zoltan Varga <vargaz@freemail.hu>
* pwd.c (Mono_Posix_Syscall_getpwnam_r): Add another part missing from the last patch.
diff --git a/support/zlib_macros.c b/support/zlib_macros.c
index 69423f2339b..dc851a7f6c2 100644
--- a/support/zlib_macros.c
+++ b/support/zlib_macros.c
@@ -15,6 +15,11 @@ create_z_stream(int compress, unsigned char gzip)
z_stream *z;
int retval;
+#if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1204)
+ /* Older versions of zlib do not support raw deflate or gzip */
+ return NULL;
+#endif
+
z = malloc (sizeof (z_stream));
z->next_in = Z_NULL;
z->avail_in = 0;