If we're loading libz dynamically, and COMP_zlib() is called more than once,

[openssl.git] / crypto / comp / c_zlib.c

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index cd2f8a491b933154f17992eb2a17f2f07fb64517..8c0876151ac7feff30760102dc0a19ef3dab7582 100644 (file)
--- 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