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 633b344830b288f4add7a8be9ddf99f0a13c89d4..e7ea46181c7a06c26f91e9fa9753358bd2a50a77 100644 (file)
--- 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 b6ac557d43c05cb52e35711688e9e67b238f10dc..d460a6b8862adc9d92bf9a3189f9b9a5697a074c 100644 (file)
--- 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