From b920e7e98a5d2b30203b95ec54add40c78f511ba Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 25 Apr 2014 14:08:32 +0000
Subject: Fold in the zlib_cleanup macro.

---
 src/lib/libssl/src/apps/apps.h    | 6 ------
 src/lib/libssl/src/apps/openssl.c | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h
index 41656f9b98..42c5f9e368 100644
--- a/src/lib/libssl/src/apps/apps.h
+++ b/src/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/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c
index a12dc98f5e..a7d1c9ba06 100644
--- a/src/lib/libssl/src/apps/openssl.c
+++ b/src/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
-- 
cgit v1.2.3-55-g6feb