From e290c7d4e02887cf3302e2902f08a14b8f1cf883 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Sat, 5 Feb 2000 21:39:20 +0000
Subject: [PATCH] Correction: openssl.c must get the long version of the
 apps_startup() macro

---
 apps/apps.h    | 2 +-
 apps/openssl.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/apps.h b/apps/apps.h
index 51733d7e0e..d2da5d196d 100644
--- 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 6b48f22e94..748c6ce71a 100644
--- 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"
-- 
2.34.1