From e8af53162c1fb3e4189bf845171c6049ead62131 Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 25 Apr 2014 14:08:32 +0000 Subject: [PATCH] Fold in the zlib_cleanup macro. --- lib/libssl/src/apps/apps.h | 6 ------ lib/libssl/src/apps/openssl.c | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/libssl/src/apps/apps.h b/lib/libssl/src/apps/apps.h index 41656f9b98b..42c5f9e3680 100644 --- a/lib/libssl/src/apps/apps.h +++ b/lib/libssl/src/apps/apps.h @@ -132,12 +132,6 @@ extern BIO *bio_err; #include -#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 a12dc98f5e1..a7d1c9ba06a 100644 --- 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 -- 2.20.1