From ecb3b95e571c30489f8eedc81ec8d8e1bd6389b0 Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Fri, 25 Apr 2014 13:56:39 +0000
Subject: [PATCH] NON_MAIN no longer means anything so remove it, along with
 APP_INIT.

ok miod@
---
 lib/libssl/src/apps/apps.c     | 13 -------------
 lib/libssl/src/apps/s_cb.c     |  2 --
 lib/libssl/src/apps/s_socket.c |  2 --
 3 files changed, 17 deletions(-)

diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c
index d2fc72f6b89..3b7adf372fa 100644
--- a/lib/libssl/src/apps/apps.c
+++ b/lib/libssl/src/apps/apps.c
@@ -135,9 +135,7 @@
 #endif
 #include <openssl/bn.h>
 
-#define NON_MAIN
 #include "apps.h"
-#undef NON_MAIN
 
 
 typedef struct {
@@ -159,8 +157,6 @@ static EVP_PKEY *load_netscape_key(BIO * err, BIO * key, const char *file,
     const char *key_descrip, int format);
 #endif
 
-int app_init(long mesgwin);
-
 int
 str2fmt(char *s)
 {
@@ -273,15 +269,6 @@ chopup_args(ARGS * arg, char *buf, int *argc, char **argv[])
 	return (1);
 }
 
-#ifndef APP_INIT
-int
-app_init(long mesgwin)
-{
-	return (1);
-}
-#endif
-
-
 int
 dump_cert_text(BIO * out, X509 * x)
 {
diff --git a/lib/libssl/src/apps/s_cb.c b/lib/libssl/src/apps/s_cb.c
index 362339c7870..51accf22da3 100644
--- a/lib/libssl/src/apps/s_cb.c
+++ b/lib/libssl/src/apps/s_cb.c
@@ -115,9 +115,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#define NON_MAIN
 #include "apps.h"
-#undef NON_MAIN
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/x509.h>
diff --git a/lib/libssl/src/apps/s_socket.c b/lib/libssl/src/apps/s_socket.c
index a44dddb6f50..a7336d60dcd 100644
--- a/lib/libssl/src/apps/s_socket.c
+++ b/lib/libssl/src/apps/s_socket.c
@@ -68,9 +68,7 @@
 
 #include <openssl/e_os2.h>
 
-#define NON_MAIN
 #include "apps.h"
-#undef NON_MAIN
 #include "s_apps.h"
 #include <openssl/ssl.h>
 
-- 
2.20.1