summaryrefslogtreecommitdiffstats
path: root/apps/apps.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-06-23 16:31:41 +0000
committerRichard Levitte <levitte@openssl.org>2001-06-23 16:31:41 +0000
commit870d986131869300c8510fdba2b4937658f3fa34 (patch)
tree1d48cf16bdbae95dd92c63ac80e4d4b771293603 /apps/apps.h
parent4f272c17f50036772570210e62e7b883e9b08b4d (diff)
apps_startup() needs a corresponding apps_shutdown().
Diffstat (limited to 'apps/apps.h')
-rw-r--r--apps/apps.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/apps/apps.h b/apps/apps.h
index 7f3903478f..34935bde42 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -116,26 +116,30 @@ extern BIO *bio_err;
#endif
#if defined(MONOLITH) && !defined(OPENSSL_C)
-# define apps_startup() do_pipe_sig()
+# define apps_startup() \
+ do_pipe_sig()
+# define apps_shutdown()
#else
# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
defined(OPENSSL_SYS_WIN32)
# ifdef _O_BINARY
# define apps_startup() \
- _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+ do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \
- setup_ui_method();
+ setup_ui_method(); } while(0)
# else
# define apps_startup() \
- _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+ do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \
- setup_ui_method();
+ setup_ui_method(); } while(0)
# endif
# else
# define apps_startup() \
- do_pipe_sig(); OpenSSL_add_all_algorithms(); \
- ENGINE_load_builtin_engines(); setup_ui_method();
+ do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
+ ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
# endif
+# define apps_shutdown() \
+ destroy_ui_method()
#endif
typedef struct args_st