diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-09-09 18:10:35 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-09-09 18:10:35 +0000 |
| commit | ef413a7ee83122dc6600b054d09fb6909f51707f (patch) | |
| tree | 73c871fde2284623d2d2eb941e2b85ec2b1572bd /crypto/des | |
| parent | dcd4d341e165730ffc01de7bf6566be0a9a99085 (diff) | |
| download | openssl-ef413a7ee83122dc6600b054d09fb6909f51707f.tar.gz | |
Merge of main trunk, no conflicts this time
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/read_pwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index 789493f0c9..9555abe3a5 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -161,7 +161,7 @@ #include <sys/ioctl.h> #endif -#ifdef MSDOS +#if defined(MSDOS) && !defined(__CYGWIN32__) #include <conio.h> #define fgets(a,b,c) noecho_fgets(a,b,c) #endif |