From 1e7e1c8d5c06207c4f99eab1f3cff7a033358ae1 Mon Sep 17 00:00:00 2001 From: Viktor Dukhovni Date: Fri, 18 Mar 2016 22:10:33 -0400 Subject: [PATCH 1/1] Revert "Include progs.h directly in openssl.c instead of via apps.h" This reverts commit a45d7d5388c6774a484cff4af13f188240d3d50b. Reviewed-by: Rich Salz --- apps/apps.h | 2 ++ apps/openssl.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 #endif +#define INCLUDE_FUNCTION_TABLE #include "apps.h" -#include "progs.h" #ifdef OPENSSL_NO_CAMELLIA -- 2.34.1