Punt HAS_STDLIB_H, NO_STDLIB_H, POSIX_TYPES; see individual ChangeLogs

for details

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

6 files changed, 22 insertions, 14 deletions

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index c3b56a751..cfdbde382 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 30 19:03:34 1997  Tom Yu  <tlyu@mit.edu>
+
+	* krbasn1.h: Replace HAS_STDLIB_H with something more sane.
+
 Thu Jul 31 15:38:10 1997  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
         * asn1buf.h (asn1buf_remove_octet, asn1buf_size, asn1buf_free,
diff --git a/src/lib/krb5/asn.1/krbasn1.h b/src/lib/krb5/asn.1/krbasn1.h
index eb63258fc..c8fe0a433 100644
--- a/src/lib/krb5/asn.1/krbasn1.h
+++ b/src/lib/krb5/asn.1/krbasn1.h
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>		/* For INT_MAX */
-#ifdef HAS_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 /*
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index d50f8e38f..7d143d202 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,16 @@
+Wed Oct  1 04:58:34 1997  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Punt some things that are otherwise gotten from
+	include/krb5/configure.in.
+
+	* gmt_mktime.c: Get k5-int.h to get some autoconf symbols.
+
+Tue Sep 30 19:57:27 1997  Tom Yu  <tlyu@mit.edu>
+
+	* timeofday.c: Replaace erroneously named POSIX_TYPES and timetype
+	with plain old time_t, since we're using AC_CHECK_TYPE now to
+	handle it.
+
 Thu Sep 25 21:24:54 1997  Tom Yu  <tlyu@mit.edu>
 
 	* mk_faddr.c: Replace KRB5_USE_INET with something more sane.
diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index e24008d96..7c3f343a5 100644
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -1,9 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-dnl time checks are for timeofday.c (which gets them from osconf.h)
-dnl and gmt_mktime.c (which only gets them from here...)
-AC_TIME_WITH_SYS_TIME
-AC_HAVE_HEADERS(unistd.h sys/time.h regex.h regexp.h regexpr.h)
+AC_HAVE_HEADERS(regex.h regexp.h regexpr.h)
 
 dnl regcomp is present but non-functional on Solaris 2.4
 AC_C_CROSS
@@ -24,7 +21,6 @@ dnl no -lgen.  This is fine.
 AC_CHECK_FUNCS(compile step)
 LIBS="$save_LIBS"
 AC_HAVE_FUNCS(re_comp)
-AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 HAS_ANSI_VOLATILE
 AC_DEFINE(AN_TO_LN_RULES)
 KRB5_BUILD_PROGRAM
diff --git a/src/lib/krb5/os/gmt_mktime.c b/src/lib/krb5/os/gmt_mktime.c
index 1cb5c2668..b231790ae 100644
--- a/src/lib/krb5/os/gmt_mktime.c
+++ b/src/lib/krb5/os/gmt_mktime.c
@@ -1,6 +1,7 @@
 /* This code placed in the public domain by Mark W. Eichin */
 
 #include <stdio.h>
+#include "k5-int.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c
index 131406fbb..42fc42fcc 100644
--- a/src/lib/krb5/os/timeofday.c
+++ b/src/lib/krb5/os/timeofday.c
@@ -29,12 +29,6 @@
 
 #include <time.h>
 
-#ifdef POSIX_TYPES
-#define timetype time_t
-#else
-#define timetype long
-#endif
-
 #ifndef HAVE_ERRNO
 extern int errno;
 #endif
@@ -45,7 +39,7 @@ krb5_timeofday(context, timeret)
     register krb5_int32 FAR *timeret;
 {
     krb5_os_context os_ctx = context->os_context;
-    timetype tval;
+    time_t tval;
 
     if (os_ctx->os_flags & KRB5_OS_TOFFSET_TIME) {
 	    *timeret = os_ctx->time_offset;
@@ -62,7 +56,7 @@ krb5_timeofday(context, timeret)
 #else
     tval = time(0);
 #endif
-    if (tval == (timetype) -1)
+    if (tval == (time_t) -1)
 	return (krb5_error_code) errno;
     if (os_ctx->os_flags & KRB5_OS_TOFFSET_VALID)
 	    tval += os_ctx->time_offset;