summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5
diff options
context:
space:
mode:
authorMark Eichin <eichin@mit.edu>1994-08-17 02:28:14 +0000
committerMark Eichin <eichin@mit.edu>1994-08-17 02:28:14 +0000
commitf22ee5a27541220707d7800a030000c9f786eabe (patch)
tree4a79ecde6c3ddb536ba882524cb574270f755e52 /src/lib/krb5
parent9cf690c88a43771d80b76a183b111ba39c7fc2f9 (diff)
downloadkrb5-f22ee5a27541220707d7800a030000c9f786eabe.tar.gz
krb5-f22ee5a27541220707d7800a030000c9f786eabe.tar.xz
krb5-f22ee5a27541220707d7800a030000c9f786eabe.zip
fix time includes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4166 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5')
-rw-r--r--src/lib/krb5/asn.1/asn1_decode.c8
-rw-r--r--src/lib/krb5/os/configure.in2
-rw-r--r--src/lib/krb5/os/gmt_mktime.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index 82dde8f00c..76304ece60 100644
--- 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 4da1e1f7b7..25cd1afec3 100644
--- 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 d4e759d170..01d87dd480 100644
--- 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 */