tf_util.c (utimes): If __SVR4 is defined, #include <utime.h>, just as

	we do if __svr4__ is defined.

g_pw_in_tkt.c: If __SVR4 is defined, #include <sgtty.h>, just as we do
	if __svr4__ is defined.  (WARNING: This code still assumes that the
	BSD ioctl's are being supported, at least in compatibility mode.  We
	should really upgrade this code to use POSIX termios calls.)

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

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 4ec3b50df5bb297bf8e8208f1883c2d94937c07c..6bd7c26f73b68bf3f9a64d297aefd2d1b14a6561 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,14 @@
+Mon Aug  7 18:40:34 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * tf_util.c (utimes): If __SVR4 is defined, #include <utime.h>,
+               just as we do if __svr4__ is defined.
+
+       * g_pw_in_tkt.c: If __SVR4 is defined, #include <sgtty.h>, just as
+               we do if __svr4__ is defined.  (WARNING: This code still
+               assumes that the BSD ioctl's are being supported, at least
+               in compatibility mode.  We should really upgrade this code
+               to use POSIX termios calls.)
+
 Tue Jun 27 23:59:28 1995  Mark Eichin  <eichin@cygnus.com>
 
        * rd_req.c (krb_rd_req): from_addr is an address, so use unsigned

diff --git a/src/lib/krb4/g_pw_in_tkt.c b/src/lib/krb4/g_pw_in_tkt.c
index 079704b49f106beacf839a7b5a6d3597466e1075..b633d164884c020b1f17b7054ae3e29d3d07c320 100644 (file)
--- a/src/lib/krb4/g_pw_in_tkt.c
+++ b/src/lib/krb4/g_pw_in_tkt.c
@@ -174,7 +174,7 @@ krb_get_pw_in_tkt_preauth(user,instance,realm,service,sinstance,life,password)
 char     *strcpy();
 int      strcmp();
 #endif
-#ifdef __svr4__
+#if defined(__svr4__) || defined(__SVR4)
 #include <sgtty.h>
 #endif
 

diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c
index 5693d4deefe561879e5fccec989fc4eb3c9d7fab..02af59d4bb1c73d6d7c793f7620e9ac455e599bf 100644 (file)
--- a/src/lib/krb4/tf_util.c
+++ b/src/lib/krb4/tf_util.c
@@ -46,7 +46,7 @@ char *shmat();
 #ifdef __SCO__
 #include <utime.h>
 #endif
-#ifdef __svr4__
+#if defined(__svr4__) || defined(__SVR4)
 #include <utime.h>
 #endif
 int utimes(path, times)