Don't define time() manually; pull it in from <time.h>

Add checking for whether we should be pulling in <time.h> and <sys/time.h>

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

4 files changed, 20 insertions, 2 deletions

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 164778a1b..0c0cd286b 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,5 +1,11 @@
 Mon Nov  7 22:16:51 1994  Theodore Y. Ts'o  (tytso@dcl)
 
+        * configure.in: Check for sys/time.h and time.h.
+
+	* defs.h: Pull in <sys/time.h> and <time.h> as necessary.
+
+	* sys_term.c (startslave): Don't define time() manually.
+
 	* configure.in: Add check for util library (needed for the Alpha)
 
 Thu Sep 29 22:51:52 1994  Theodore Y. Ts'o  (tytso@dcl)
diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index fca44b751..db8163f8d 100644
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -23,6 +23,8 @@ AC_COMPILE_CHECK([cc_t],[#include <termio.h>],
 [cc_t foo;],,AC_DEFINE(NO_CC_T))
 fi
 fi
+AC_HEADER_TIME
+AC_CHECK_HEADERS(sys/time.h)
 AC_HAVE_FUNCS(vhangup)
 AC_FUNC_CHECK(grantpt,AC_DEFINE(STREAMSPTY))
 AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS))
diff --git a/src/appl/telnet/telnetd/defs.h b/src/appl/telnet/telnetd/defs.h
index a73d4a619..4b7b5204f 100644
--- a/src/appl/telnet/telnetd/defs.h
+++ b/src/appl/telnet/telnetd/defs.h
@@ -77,7 +77,18 @@
 #include <fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #ifndef	FILIO_H
 #include <sys/ioctl.h>
 #else
diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index 12e734c78..79ae78f1d 100644
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -1352,7 +1352,6 @@ startslave(host, autologin, autoname)
 	char *autoname;
 {
 	register int i;
-	long time();
 #ifdef	NEWINIT
 	extern char *ptyip;
 	struct init_request request;