diff options
| author |   markus <markus@openbsd.org> | 2002-09-10 16:31:53 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-09-10 16:31:53 +0000 |
| commit | 1f9308f95cf5f2eb77b454500c9bb49d76673ef3 (patch) | |
| tree | c6825952eba2bd0bea9ff46656b25ab7eea8284b /lib/libcrypto/ui | |
| parent | Update list of supported CMD and Promise devices. (diff) | |
| download | wireguard-openbsd-1f9308f95cf5f2eb77b454500c9bb49d76673ef3.tar.xz wireguard-openbsd-1f9308f95cf5f2eb77b454500c9bb49d76673ef3.zip | |
merge openssl-0.9.7-beta3, tested on vax by miod@
Diffstat (limited to 'lib/libcrypto/ui')
| -rw-r--r-- | lib/libcrypto/ui/Makefile.ssl | 2 | ||||
| -rw-r--r-- | lib/libcrypto/ui/ui_openssl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/ui/Makefile.ssl b/lib/libcrypto/ui/Makefile.ssl index 7de1d0022b4..57b2e38335f 100644 --- a/lib/libcrypto/ui/Makefile.ssl +++ b/lib/libcrypto/ui/Makefile.ssl @@ -72,7 +72,7 @@ lint: lint -DLINT $(INCLUDES) $(SRC)>fluff depend: - $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) + $(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new diff --git a/lib/libcrypto/ui/ui_openssl.c b/lib/libcrypto/ui/ui_openssl.c index 821dd29eaaf..f47ed31cb02 100644 --- a/lib/libcrypto/ui/ui_openssl.c +++ b/lib/libcrypto/ui/ui_openssl.c @@ -269,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 -#ifndef OPENSSL_SYS_MSDOS +#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) static TTY_STRUCT tty_orig,tty_new; #endif #endif |