From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Sat, 19 Mar 2016 02:10:33 +0000 (-0400)
Subject: Revert "Include progs.h directly in openssl.c instead of via apps.h"
X-Git-Tag: OpenSSL_1_1_0-pre5~296
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1e7e1c8d5c06207c4f99eab1f3cff7a033358ae1;p=oweals%2Fopenssl.git

Revert "Include progs.h directly in openssl.c instead of via apps.h"

This reverts commit a45d7d5388c6774a484cff4af13f188240d3d50b.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/apps.h b/apps/apps.h
index 633b344830..e7ea46181c 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -631,4 +631,6 @@ extern int verify_quiet;
 extern int verify_error;
 extern int verify_return_error;
 
+# include "progs.h"
+
 #endif
diff --git a/apps/openssl.c b/apps/openssl.c
index b6ac557d43..d460a6b886 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -132,8 +132,8 @@
 #ifdef OPENSSL_SYS_VMS
 # include <unixio.h>
 #endif
+#define INCLUDE_FUNCTION_TABLE
 #include "apps.h"
-#include "progs.h"
 
 
 #ifdef OPENSSL_NO_CAMELLIA