fix time includes

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

diff --git a/src/kadmin/server/adm_fmt_inq.c b/src/kadmin/server/adm_fmt_inq.c
index 6982037723c49f7752b89e0c0a14ea93879c2852..be1813258a150b3b47dbc13563ed2c20dc223f5e 100644 (file)
--- a/src/kadmin/server/adm_fmt_inq.c
+++ b/src/kadmin/server/adm_fmt_inq.c
@@ -41,7 +41,7 @@ static char rcsid_adm_fmt_inq[] =
 
 #include <stdio.h>
 
-#ifdef USE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #ifdef TIME_WITH_SYS_TIME
 #include <time.h>

diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c
index 757026b299e53ae5b799b0bf0bb3ad0bdedb54b7..6db66075fff09624658c0e6f6ff8b5d47ca77aa1 100644 (file)
--- a/src/kdc/kerberos_v4.c
+++ b/src/kdc/kerberos_v4.c
@@ -50,8 +50,11 @@ static char rcsid_kerberos_v4_c[] =
 #include <sgtty.h>
 #endif
 #include <sys/ioctl.h>
-#ifdef USE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
 #else
 #include <time.h>
 #endif

diff --git a/src/lib/crypto/os/rnd_confoun.c b/src/lib/crypto/os/rnd_confoun.c
index 9d01b1d9606d6fdfdb5fa64db642f6b5b769cf8b..5137af17660c49872be57f4733f91afb45f751b7 100644 (file)
--- a/src/lib/crypto/os/rnd_confoun.c
+++ b/src/lib/crypto/os/rnd_confoun.c
@@ -32,8 +32,11 @@ static char rcsid_rnd_counfoun_c[] =
 
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
-#ifdef USE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
 #else
 #include <time.h>
 #endif

diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index 82dde8f00c2db9fadb2b9a8a856a8a8eff83e9fb..76304ece60a2493e8e05b9cd29b2f767bc18af6b 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -25,9 +25,13 @@
 /* ASN.1 primitive decoders */
 #include "asn1_decode.h"
 #include "asn1_get.h"
-#include <time.h>
-#ifdef USE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
+#else
+#include <time.h>
 #endif
 
 #define setup()\

diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in
index 4da1e1f7b7c7f2498d00945e709e6860992dab49..25cd1afec3f7f2008e0d9a2d4d1d96184f599bbf 100644 (file)
--- a/src/lib/krb5/os/configure.in
+++ b/src/lib/krb5/os/configure.in
@@ -2,7 +2,7 @@ AC_INIT(configure.in)
 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_HEADER_CHECK(sys/time.h,AC_DEFINE(USE_SYS_TIME_H))
+AC_HAVE_HEADERS(sys/time.h)
 AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 WITH_CCOPTS
 AC_SET_BUILDTOP

diff --git a/src/lib/krb5/os/gmt_mktime.c b/src/lib/krb5/os/gmt_mktime.c
index d4e759d1709915b4306e209b7eb62f5b1e8e8256..01d87dd4802a33d6d867e27f2826f8a54fc7124c 100644 (file)
--- a/src/lib/krb5/os/gmt_mktime.c
+++ b/src/lib/krb5/os/gmt_mktime.c
@@ -3,9 +3,13 @@
 #include <stdio.h>
 
 #include <sys/types.h>
-#include <time.h>
-#ifdef USE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <time.h>
+#endif
+#else
+#include <time.h>
 #endif
 
 /* take a struct tm, return seconds from GMT epoch */