projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for DJGPP.
[openssl.git]
/
crypto
/
ui
/
ui_openssl.c
diff --git
a/crypto/ui/ui_openssl.c
b/crypto/ui/ui_openssl.c
index 95e0b6e9216e1611d643d572d048efd2e41a3049..2c2fbc044395ba712976aec977b99fba97790e0e 100644
(file)
--- a/
crypto/ui/ui_openssl.c
+++ b/
crypto/ui/ui_openssl.c
@@
-191,6
+191,12
@@
# define SGTTY
#endif
# define SGTTY
#endif
+#if defined(OPENSSL_SYS_VSWORKS)
+#undef TERMIOS
+#undef TERMIO
+#undef SGTTY
+#endif
+
#ifdef TERMIOS
# include <termios.h>
# define TTY_STRUCT struct termios
#ifdef TERMIOS
# include <termios.h>
# define TTY_STRUCT struct termios
@@
-263,7
+269,7
@@
static long tty_orig[3], tty_new[3]; /* XXX Is there any guarantee that this w
static long status;
static unsigned short channel = 0;
#else
static long status;
static unsigned short channel = 0;
#else
-#if
ndef OPENSSL_SYS_MSDOS
+#if
!defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
static TTY_STRUCT tty_orig,tty_new;
#endif
#endif
static TTY_STRUCT tty_orig,tty_new;
#endif
#endif
@@
-444,7
+450,7
@@
static int open_console(UI *ui)
CRYPTO_w_lock(CRYPTO_LOCK_UI);
is_a_tty = 1;
CRYPTO_w_lock(CRYPTO_LOCK_UI);
is_a_tty = 1;
-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC)
+#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC)
|| defined(OPENSSL_SYS_VSWORKS)
tty_in=stdin;
tty_out=stderr;
#else
tty_in=stdin;
tty_out=stderr;
#else
@@
-459,7
+465,7
@@
static int open_console(UI *ui)
tty_out=stderr;
#endif
tty_out=stderr;
#endif
-#if defined(TTY_get) && !defined(VMS)
+#if defined(TTY_get) && !defined(
OPENSSL_SYS_
VMS)
if (TTY_get(fileno(tty_in),&tty_orig) == -1)
{
#ifdef ENOTTY
if (TTY_get(fileno(tty_in),&tty_orig) == -1)
{
#ifdef ENOTTY