Commit 36d51bea authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent fc12885b

crypto/comp/c_zlib.c

+7 −2
Original line number Diff line number Diff line
@@ -397,12 +397,17 @@ COMP_METHOD *COMP_zlib(void) 
			p_deflateInit_

				= (deflateInit__ft) DSO_bind_func(zlib_dso,

					"deflateInit_");



			if (p_compress && p_inflateEnd && p_inflate

				&& p_inflateInit_ && p_deflateEnd

				&& p_deflate && p_deflateInit_)

				zlib_loaded++;

			}

		}



#endif

#if defined(ZLIB) || defined(ZLIB_SHARED)

	if (zlib_loaded)

		meth = &zlib_stateful_method;

#endif