From: Richard Levitte <levitte@openssl.org>
Date: Fri, 18 Mar 2016 23:43:43 +0000 (+0100)
Subject: Include progs.h directly in openssl.c instead of via apps.h
X-Git-Tag: OpenSSL_1_1_0-pre5~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a45d7d5388c6774a484cff4af13f188240d3d50b;p=openssl

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

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

diff --git a/apps/apps.h b/apps/apps.h
index e7ea46181c..633b344830 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -631,6 +631,4 @@ 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 d460a6b886..b6ac557d43 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