From: jsing <jsing@openbsd.org>
Date: Fri, 25 Apr 2014 14:08:32 +0000 (+0000)
Subject: Fold in the zlib_cleanup macro.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e8af53162c1fb3e4189bf845171c6049ead62131;p=openbsd

Fold in the zlib_cleanup macro.
---

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 <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 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