diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-08-17 02:26:06 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-08-17 02:26:06 +0000 |
| commit | 9cf690c88a43771d80b76a183b111ba39c7fc2f9 (patch) | |
| tree | 2237327ed2b282e656b17f6a5eae9634cbde0bae | |
| parent | cd6d673bb089232f8254288968a98f58358b1bca (diff) | |
| download | krb5-9cf690c88a43771d80b76a183b111ba39c7fc2f9.tar.gz krb5-9cf690c88a43771d80b76a183b111ba39c7fc2f9.tar.xz krb5-9cf690c88a43771d80b76a183b111ba39c7fc2f9.zip | |
setup to fix time includes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4165 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/include/krb5/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/krb5/acconfig.h | 2 | ||||
| -rw-r--r-- | src/include/krb5/configure.in | 2 | ||||
| -rw-r--r-- | src/include/krb5/stock/osauto.h | 8 | ||||
| -rw-r--r-- | src/include/krb5/stock/osconf.h | 3 | ||||
| -rw-r--r-- | src/include/krb5/sysincl.h | 8 |
6 files changed, 15 insertions, 16 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index a617fe4f3..7a3d215a7 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,11 @@ +Tue Aug 16 22:01:56 1994 Mark Eichin (eichin@cygnus.com) + + * configure.in: change test for USE_SYS_TIME_H to consistent + (autoconf style) check for HAVE_SYS_TIME_H with + TIME_WITH_SYS_TIME, and use them everywhere. + * stock/osauto.h: get rid of USE_TIME_H. + * stock/osconf.h: get rid of USE_TIME_H, rename USE_SYS_TIME_H. + Tue Aug 9 02:17:40 1994 Tom Yu (tlyu@dragons-lair) * preauth.h: fix preauth function names as well (timestamp -> diff --git a/src/include/krb5/acconfig.h b/src/include/krb5/acconfig.h index eaf5ca50d..cc15d2b6b 100644 --- a/src/include/krb5/acconfig.h +++ b/src/include/krb5/acconfig.h @@ -27,4 +27,4 @@ #undef HAS_UNISTD_H #undef KRB5_USE_INET #undef ODBM -#undef USE_SYS_TIME_H +#undef TM_IN_SYS_TIME diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index 3b4d5b0cd..0d3ac7d67 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -78,7 +78,7 @@ AC_DEFINE(BITS32) dnl then from osconf.h, we have 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_CHECK(netinet/in.h,AC_DEFINE(KRB5_USE_INET)) AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H)) diff --git a/src/include/krb5/stock/osauto.h b/src/include/krb5/stock/osauto.h index 17266d326..4f204921c 100644 --- a/src/include/krb5/stock/osauto.h +++ b/src/include/krb5/stock/osauto.h @@ -35,12 +35,4 @@ #include "autoconf.h" #endif -#ifdef USE_SYS_TIME_H -#ifdef TIME_WITH_SYS_TIME -#define USE_TIME_H -#endif /* TIME_WITH_SYS_TIME */ -#else /* !USE_SYS_TIME_H */ -#define USE_TIME_H -#endif /* USE_SYS_TIME_H */ - /* remainder added on */ diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h index 23a9ed122..8e2b73d1e 100644 --- a/src/include/krb5/stock/osconf.h +++ b/src/include/krb5/stock/osconf.h @@ -40,9 +40,6 @@ #ifdef UseSysTimeH #define USE_SYS_TIME_H /* Needs <sys/time.h> for time includes. */ #endif -#ifdef UseTimeH -#define USE_TIME_H /* Needs <time.h> for time includes. */ -#endif #ifdef HasInetTrue #define KRB5_USE_INET /* Support IP address family */ diff --git a/src/include/krb5/sysincl.h b/src/include/krb5/sysincl.h index 260846939..f74886882 100644 --- a/src/include/krb5/sysincl.h +++ b/src/include/krb5/sysincl.h @@ -36,11 +36,13 @@ #endif /* KRB5_SYSTYPES__ */ #include <krb5/osconf.h> /* USE*TIME_H macros */ -#ifdef USE_TIME_H +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#ifdef TIME_WITH_SYS_TIME #include <time.h> #endif -#ifdef USE_SYS_TIME_H -#include <sys/time.h> /* struct timeval, utimes() */ +#else +#include <time.h> #endif #include <sys/stat.h> /* struct stat, stat() */ #include <sys/param.h> /* MAXPATHLEN */ |