diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-12 17:29:26 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-12 17:30:54 -0500 |
| commit | 6d23cf97443bfedf755341b4f2d0d7fce254e020 (patch) | |
| tree | ef52ffc0029a579d35439f2dc0ba2deee966ed93 /crypto/ui/ui_openssl.c | |
| parent | 31d1d3741f16bd80ec25f72dcdbf6bbdc5664374 (diff) | |
RT3548: Remove unsupported platforms
This last one for this ticket. Removes WIN16.
So long, MS_CALLBACK and MS_FAR. We won't miss you.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/ui/ui_openssl.c')
| -rw-r--r-- | crypto/ui/ui_openssl.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 72d85eefcd..2031b66518 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -155,13 +155,6 @@ # endif #endif -#ifdef WIN16TTY -# undef OPENSSL_SYS_WIN16 -# undef WIN16 -# undef _WINDOWS -# include <graph.h> -#endif - /* 06-Apr-92 Luke Brennan Support for VMS */ #include "ui_locl.h" #include "cryptlib.h" @@ -301,13 +294,13 @@ static FILE *tty_in, *tty_out; static int is_a_tty; /* Declare static functions */ -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) static int read_till_nl(FILE *); static void recsig(int); static void pushsig(void); static void popsig(void); #endif -#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16) +#if defined(OPENSSL_SYS_MSDOS) static int noecho_fgets(char *buf, int size, FILE *tty); #endif static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl); @@ -393,7 +386,7 @@ static int read_string(UI *ui, UI_STRING *uis) } -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) /* Internal functions to read a string without echoing */ static int read_till_nl(FILE *in) { @@ -416,7 +409,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl) int ok; char result[BUFSIZ]; int maxsize = BUFSIZ-1; -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) char *p; intr_signal=0; @@ -582,7 +575,7 @@ static int close_console(UI *ui) } -#if !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if !defined(OPENSSL_SYS_WINCE) /* Internal functions to handle signals and act on them */ static void pushsig(void) { @@ -668,7 +661,7 @@ static void recsig(int i) #endif /* Internal functions specific for Windows */ -#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16) && !defined(OPENSSL_SYS_WINCE) +#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WINCE) static int noecho_fgets(char *buf, int size, FILE *tty) { int i; @@ -683,9 +676,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty) break; } size--; -#ifdef WIN16TTY - i=_inchar(); -#elif defined(_WIN32) +#if defined(_WIN32) i=_getch(); #else i=getch(); |