From: Mark Eichin <eichin@mit.edu>
Date: Tue, 18 Oct 1994 20:25:34 +0000 (+0000)
Subject: 	* krlogind.c: use HAVE_STREAMS, fix TIOCPKT_* test
X-Git-Tag: krb5-1.0-beta5~1103
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4115550cea9a98cf647be00c618cddf3e21dba97;p=krb5.git

	* krlogind.c: use HAVE_STREAMS, fix TIOCPKT_* test

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4533 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index e351f5585..274da338b 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -3,6 +3,7 @@ Tue Oct 18 15:48:37 1994  Mark Eichin  (eichin@cygnus.com)
 	* configure.in (HAVE_STREAMS): test for streams interface headers
 	in a way that fails on sunos but works on solaris.
 	* krlogin.c: use HAVE_STREAMS.
+	* krlogind.c: use HAVE_STREAMS, fix TIOCPKT_* test.
 
 Tue Oct  4 17:14:38 1994  Theodore Y. Ts'o  (tytso@dcl)
 
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 6b54bb17e..257ddbbdf 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -164,16 +164,19 @@ char copyright[] =
 #include <sys/tty.h>
 #endif
 
-#ifndef HAVE_SYS_PTYVAR_H
+#ifdef HAVE_STREAMS
+/* but solaris actually uses packet mode, so the real macros are needed too */
+#include <sys/ptyvar.h>
+#endif
+
+#ifndef TIOCPKT_NOSTOP
 /* These values are over-the-wire protocol, *not* local values */
 #define TIOCPKT_NOSTOP          0x10
 #define TIOCPKT_DOSTOP          0x20
 #define TIOCPKT_FLUSHWRITE      0x02
-#else
-/* but solaris actually uses packet mode, so the real macros are needed too */
-#include <sys/ptyvar.h>
 #endif
 
+
 #ifdef HAVE_SYS_FILIO_H
 /* get FIONBIO from sys/filio.h, so what if it is a compatibility feature */
 #include <sys/filio.h>