summaryrefslogtreecommitdiffstats
path: root/crypto/comp
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-10-04 13:04:37 +0000
committerRichard Levitte <levitte@openssl.org>2002-10-04 13:04:37 +0000
commite984b2af64e7bda295edb5c963e1b8932112230e (patch)
tree35abecd763cce51781d1dc0c118009819402e718 /crypto/comp
parent70e96dcf5930c14f25f64b99f7fc30fdc2c24239 (diff)
If we're loading libz dynamically, and COMP_zlib() is called more than once,
only the first call would provide the correct result. PR: 277
Diffstat (limited to 'crypto/comp')
-rw-r--r--crypto/comp/c_zlib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index cd2f8a491b..8c0876151a 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -208,11 +208,11 @@ COMP_METHOD *COMP_zlib(void)
= (inflateInit__ft) DSO_bind_func(zlib_dso,
"inflateInit_");
zlib_loaded++;
- meth = &zlib_method;
}
}
-#elif defined(ZLIB)
+#endif
+#if defined(ZLIB) || defined(ZLIB_SHARED)
meth = &zlib_method;
#endif