Fold in the zlib_cleanup macro.

diff --git a/lib/libssl/src/apps/apps.h b/lib/libssl/src/apps/apps.h
index 41656f9..42c5f9e 100644 (file)
--- a/lib/libssl/src/apps/apps.h
+++ b/lib/libssl/src/apps/apps.h
@@ -132,12 +132,6 @@ extern BIO *bio_err;
 
 #include <signal.h>
 
-#ifdef OPENSSL_NO_COMP
-#define zlib_cleanup()
-#else
-#define zlib_cleanup() COMP_zlib_cleanup()
-#endif
-
 typedef struct args_st {
        char **data;
        int count;

diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c
index a12dc98..a7d1c9b 100644 (file)
--- a/lib/libssl/src/apps/openssl.c
+++ b/lib/libssl/src/apps/openssl.c
@@ -228,7 +228,10 @@ openssl_shutdown(void)
        ERR_remove_thread_state(NULL);
        RAND_cleanup();
        ERR_free_strings();
-       zlib_cleanup();
+
+#ifndef OPENSSL_NO_COMP
+       COMP_zlib_cleanup();
+#endif
 }
 
 int