diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/ui | |
| parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
| download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/ui')
| -rw-r--r-- | src/lib/libcrypto/ui/ui_openssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c index 8446673ed4..5fbedf6ff8 100644 --- a/src/lib/libcrypto/ui/ui_openssl.c +++ b/src/lib/libcrypto/ui/ui_openssl.c | |||
| @@ -678,6 +678,8 @@ static int noecho_fgets(char *buf, int size, FILE *tty) | |||
| 678 | size--; | 678 | size--; |
| 679 | #ifdef WIN16TTY | 679 | #ifdef WIN16TTY |
| 680 | i=_inchar(); | 680 | i=_inchar(); |
| 681 | #elif defined(_WIN32) | ||
| 682 | i=_getch(); | ||
| 681 | #else | 683 | #else |
| 682 | i=getch(); | 684 | i=getch(); |
| 683 | #endif | 685 | #endif |