diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-08-05 15:29:14 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-08-05 15:29:14 +0000 |
| commit | f45e8c7bddb5eaa38cbc2fd443cf946a834e61c5 (patch) | |
| tree | f9c7abe2dddd88cd5116af48294da47e3c8d633c /apps/apps.h | |
| parent | ea904b40741c8b8b4b6ce6a74bfcbccafb6e2945 (diff) | |
| download | openssl-f45e8c7bddb5eaa38cbc2fd443cf946a834e61c5.tar.gz | |
PR: 2000
Submitted by: Vadim Zeitlin <vz-openssl@zeitlins.org>
Approved by: steve@openssl.org
Make no-comp compile without warnings.
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/apps.h b/apps/apps.h index cdfb5efa5a..361ca9eea4 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -168,6 +168,12 @@ extern BIO *bio_err; #define do_pipe_sig() #endif +#ifdef OPENSSL_NO_COMP +#define zlib_cleanup() +#else +#define zlib_cleanup() COMP_zlib_cleanup() +#endif + #if defined(MONOLITH) && !defined(OPENSSL_C) # define apps_startup() \ do_pipe_sig() @@ -182,7 +188,7 @@ extern BIO *bio_err; do { CONF_modules_unload(1); destroy_ui_method(); \ OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \ CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \ - ERR_free_strings(); COMP_zlib_cleanup();} while(0) + ERR_free_strings(); zlib_cleanup();} while(0) # else # define apps_startup() \ do { do_pipe_sig(); CRYPTO_malloc_init(); \ @@ -192,7 +198,7 @@ extern BIO *bio_err; do { CONF_modules_unload(1); destroy_ui_method(); \ OBJ_cleanup(); EVP_cleanup(); \ CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \ - ERR_free_strings(); } while(0) + ERR_free_strings(); zlib_cleanup(); } while(0) # endif #endif |