Correction: openssl.c must get the long version of the apps_startup()

macro

diff --git a/apps/apps.h b/apps/apps.h
index 51733d7e0ecb06d662f031af8d502f5827da4f7b..d2da5d196d51e792a70865009e5959ad86bba456 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -113,7 +113,7 @@ extern BIO *bio_err;
 #define do_pipe_sig()
 #endif
 
-#if defined(MONOLITH)
+#if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup()       do_pipe_sig()
 #else
 #  if defined(MSDOS) || defined(WIN16) || defined(WIN32)

diff --git a/apps/openssl.c b/apps/openssl.c
index 6b48f22e9463c239c0e16e92868b07c255b8616b..748c6ce71a1d52d5c8a0d4717523f508a7ddda78 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -71,6 +71,7 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
+#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
 #include "apps.h"
 #include "progs.h"
 #include "s_apps.h"