Remove HEADER_X509_H and HEADER_SSL_H include detectors from apps

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 43af5ad2a4b5ca2b86eb06b0877c797e08f636db..79d6bec6c25e9c5d8eeb19c10e2f6c1efc87383d 100644 (file)
--- 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
+
 #define PASS_SOURCE_SIZE_MAX 4
 
 typedef struct {