diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-07-12 22:49:42 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-07-24 17:08:38 +0200 |
| commit | 77cb24344dd522b4b7882be50aa199b1ecf4711f (patch) | |
| tree | a02a078bdb6aa3f1bc9450690075daccc9975792 /apps/apps.c | |
| parent | 19b7b64c7284dea373b454e14360e786ffca6375 (diff) | |
Remove HEADER_X509_H include detector from apps
The HEADER_X509_H check is redundant, because <openssl/x509.h>
is already included.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9365)
Diffstat (limited to 'apps/apps.c')
| -rw-r--r-- | apps/apps.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/apps.c b/apps/apps.c index 36cb0b2783..7177c5d982 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -40,7 +40,6 @@ #endif #include <openssl/bn.h> #include <openssl/ssl.h> -#include "s_apps.h" #include "apps.h" #ifdef _WIN32 @@ -48,6 +47,14 @@ static int WIN32_rename(const char *from, const char *to); # define rename(from,to) WIN32_rename((from),(to)) #endif +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) +# include <conio.h> +#endif + +#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32) +# define _kbhit kbhit +#endif + typedef struct { const char *name; unsigned long flag; |