diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/ChangeLog | 7 | ||||
-rw-r--r-- | src/include/k5-int.h | 8 | ||||
-rw-r--r-- | src/include/krb5/ChangeLog | 7 | ||||
-rw-r--r-- | src/include/krb5/configure.in | 15 | ||||
-rw-r--r-- | src/include/win-mac.h | 2 |
5 files changed, 22 insertions, 17 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index a82c21bc4b..7853a60d05 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 30 18:56:05 1997 Tom Yu <tlyu@mit.edu> + + * win-mac.h: Replace HAS_STDLIB_H with something more sane. + + * k5-int.h: Replace HAS_STDLIB_H, NO_STDLIB_H with something more + sane. + Thu Sep 25 21:10:37 1997 Tom Yu <tlyu@mit.edu> * win-mac.h: Replace KRB5_USE_INET with something more sane. diff --git a/src/include/k5-int.h b/src/include/k5-int.h index acb0fca197..7ce0409016 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -350,20 +350,16 @@ typedef struct _krb5_sam_response { #ifndef KRB5_EXT_PROTO__ #define KRB5_EXT_PROTO__ -#ifdef HAS_STDLIB_H +#ifdef HAVE_STDLIB_H #include <stdlib.h> #else #if defined(__STDC__) || defined(_MSDOS) -#ifdef NO_STDLIB_H #include <fake-stdlib.h> #else -#include <stdlib.h> -#endif /* NO_STDLIB_H */ -#else extern char *malloc(), *realloc(), *calloc(); extern char *getenv(); #endif /* ! __STDC__ */ -#endif /* HAS_STDLIB_H */ +#endif /* HAVE_STDLIB_H */ #ifdef HAVE_STRING_H #include <string.h> diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 826e96773c..af6652b8b9 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 30 17:19:16 1997 Tom Yu <tlyu@mit.edu> + + * configure.in: Remove references to dbm and ndbm. Replace + HAS_STDLIB_H and NO_STDLIB_H with something more sane. Replace + AC_TIME_WITH_SYS_TIME with more a recent form. Use AC_CHECK_TYPE + to check for time_t instead of erroneously named POSIX_TYPES. + Thu Sep 25 21:50:44 1997 Tom Yu <tlyu@mit.edu> * configure.in: Replace KRB5_USE_INET, HAS_UNISTD_H, HAS_SETVBUF. diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index f197553267..1f38ffc30d 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -13,16 +13,13 @@ AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) KRB5_POSIX_LOCKS -dnl time_t, only used in lib/krb5/os/timeofday.c -AC_EGREP_HEADER(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES)) - KRB5_SIGTYPE dnl dnl -AC_CHECK_HEADERS(string.h unistd.h) -AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H),AC_DEFINE(NO_STDLIB_H)) -AC_CHECK_HEADERS(sys/types.h sys/file.h sys/param.h sys/stat.h macsock.h stddef.h xom.h dbm.h ndbm.h) +AC_CHECK_HEADERS(stdlib.h string.h stddef.h unistd.h) +AC_CHECK_HEADERS(sys/types.h sys/file.h sys/param.h sys/stat.h) +AC_CHECK_HEADERS(macsock.h xom.h) AC_HEADER_STDARG dnl check for ANSI stdio, esp "b" option to fopen(). This (unfortunately) @@ -82,14 +79,12 @@ AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) dnl then from osconf.h, we have -AC_TIME_WITH_SYS_TIME +AC_HEADER_TIME AC_CHECK_HEADERS(sys/time.h) +AC_CHECK_TYPE(time_t, long) AC_CHECK_HEADERS(netinet/in.h) -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) - dnl dnl Determine where to put the replay cache. dnl diff --git a/src/include/win-mac.h b/src/include/win-mac.h index cd787d0c71..a764943365 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -149,7 +149,7 @@ typedef unsigned char u_char; #define KRB5_PROVIDE_PROTOTYPES #define HAVE_STDARG_H #define HAVE_SYS_TYPES_H -#define HAS_STDLIB_H +#define HAVE_STDLIB_H /* This controls which encryption routines libcrypto will provide */ #define PROVIDE_DES_CBC_MD5 |