summaryrefslogtreecommitdiffstats
path: root/apps/s_apps.h
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2008-12-22 14:05:42 +0000
committerAndy Polyakov <appro@openssl.org>2008-12-22 14:05:42 +0000
commit2140659b00af2e6e392c859cfc392c68d0fe0a10 (patch)
treedfa6f13c6be54d9e083d049097fde55b87c1b9b5 /apps/s_apps.h
parente527201f6be3c295358bcc8b6bafec598f02dc97 (diff)
Incidentally http://cvs.openssl.org/chngview?cn=17710 also made it possible
to build the library without -D_CRT_NONSTDC_NO_DEPRECATE. This commit expands it even to apps catalog and actually omits the macro in question from Configure.
Diffstat (limited to 'apps/s_apps.h')
-rw-r--r--apps/s_apps.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h
index 61dbf8af67..be3b4da740 100644
--- a/apps/s_apps.h
+++ b/apps/s_apps.h
@@ -117,7 +117,7 @@
#include <conio.h>
#endif
-#ifdef OPENSSL_SYS_MSDOS
+#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
#define _kbhit kbhit
#endif