diff options
author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-03-18 22:10:33 -0400 |
---|---|---|
committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-03-19 13:29:10 -0400 |
commit | 1e7e1c8d5c06207c4f99eab1f3cff7a033358ae1 (patch) | |
tree | 15a90a08892124df5af37e210a4bde4a9b0ff5d0 /apps | |
parent | 5a339364f75342978cc3943f788037cb47ee529e (diff) | |
download | openssl-new-1e7e1c8d5c06207c4f99eab1f3cff7a033358ae1.tar.gz |
Revert "Include progs.h directly in openssl.c instead of via apps.h"
This reverts commit a45d7d5388c6774a484cff4af13f188240d3d50b.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/apps.h | 2 | ||||
-rw-r--r-- | apps/openssl.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 |