diff options
Diffstat (limited to 'src/lib/libcrypto/comp/c_zlib.c')
-rw-r--r-- | src/lib/libcrypto/comp/c_zlib.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c index 1bd2850d15..8c0876151a 100644 --- a/src/lib/libcrypto/comp/c_zlib.c +++ b/src/lib/libcrypto/comp/c_zlib.c | |||
@@ -3,7 +3,6 @@ | |||
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <openssl/objects.h> | 4 | #include <openssl/objects.h> |
5 | #include <openssl/comp.h> | 5 | #include <openssl/comp.h> |
6 | #include <openssl/err.h> | ||
7 | 6 | ||
8 | COMP_METHOD *COMP_zlib(void ); | 7 | COMP_METHOD *COMP_zlib(void ); |
9 | 8 | ||
@@ -190,17 +189,7 @@ COMP_METHOD *COMP_zlib(void) | |||
190 | if (!zlib_loaded) | 189 | if (!zlib_loaded) |
191 | { | 190 | { |
192 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) | 191 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) |
193 | zlib_dso = DSO_load(NULL, "ZLIB1", NULL, 0); | 192 | zlib_dso = DSO_load(NULL, "ZLIB", NULL, 0); |
194 | if (!zlib_dso) | ||
195 | { | ||
196 | zlib_dso = DSO_load(NULL, "ZLIB", NULL, 0); | ||
197 | if (zlib_dso) | ||
198 | { | ||
199 | /* Clear the errors from the first failed | ||
200 | DSO_load() */ | ||
201 | ERR_clear_error(); | ||
202 | } | ||
203 | } | ||
204 | #else | 193 | #else |
205 | zlib_dso = DSO_load(NULL, "z", NULL, 0); | 194 | zlib_dso = DSO_load(NULL, "z", NULL, 0); |
206 | #endif | 195 | #endif |