diff options
| -rw-r--r-- | src/kadmin/server/adm_fmt_inq.c | 2 | ||||
| -rw-r--r-- | src/kdc/kerberos_v4.c | 5 | ||||
| -rw-r--r-- | src/lib/crypto/os/rnd_confoun.c | 5 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_decode.c | 8 | ||||
| -rw-r--r-- | src/lib/krb5/os/configure.in | 2 | ||||
| -rw-r--r-- | src/lib/krb5/os/gmt_mktime.c | 8 |
6 files changed, 22 insertions, 8 deletions
diff --git a/src/kadmin/server/adm_fmt_inq.c b/src/kadmin/server/adm_fmt_inq.c index 6982037723..be1813258a 100644 --- 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 757026b299..6db66075ff 100644 --- 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 9d01b1d960..5137af1766 100644 --- 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 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 */ |