From: Sam Hartman Date: Sat, 22 Feb 1997 07:58:22 +0000 (+0000) Subject: * Make shared libs work on AIX X-Git-Tag: krb5-1.1-beta1~1243 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=259d6f7c55696d724b5812984b94734f5453a62a;p=krb5.git * Make shared libs work on AIX * DO not use #ifdef unix git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9948 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index 0b820c611..43cb228ba 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 22 00:49:37 1997 Sam Hartman + + * krb.h: Do not depend on unix being defined on Unix systems; + treat as the default case except when _WINDOWS defined + Thu Feb 20 17:38:23 1997 Richard Basch * configure.in: awk is required by the Makefile diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h index 1040facf2..ffe887931 100644 --- a/src/include/kerberosIV/krb.h +++ b/src/include/kerberosIV/krb.h @@ -378,7 +378,12 @@ typedef struct msg_dat MSG_DAT; #define KOPT_DO_OLDSTYLE 0x00000008 /* use the old-style protocol */ #endif /* ATHENA_COMPAT */ -#ifdef unix + +#ifdef _WINDOWS +#define TIME_GMT_UNIXSEC win_time_gmt_unixsec((unsigned KRB4_32 *)0) +#define TIME_GMT_UNIXSEC_US(us) win_time_gmt_unixsec((us)) +#define CONVERT_TIME_EPOCH win_time_get_epoch() +#else /* until we do V4 compat under DOS, just turn this off */ #define _fmemcpy memcpy #define _fstrncpy strncpy @@ -387,13 +392,8 @@ typedef struct msg_dat MSG_DAT; #define TIME_GMT_UNIXSEC unix_time_gmt_unixsec((unsigned KRB4_32 *)0) #define TIME_GMT_UNIXSEC_US(us) unix_time_gmt_unixsec((us)) #define CONVERT_TIME_EPOCH ((long)0) /* Unix epoch is Krb epoch */ -#endif +#endif /*_WINDOWS*/ -#ifdef _WINDOWS -#define TIME_GMT_UNIXSEC win_time_gmt_unixsec((unsigned KRB4_32 *)0) -#define TIME_GMT_UNIXSEC_US(us) win_time_gmt_unixsec((us)) -#define CONVERT_TIME_EPOCH win_time_get_epoch() -#endif /* Define u_char, u_short, u_int, and u_long. */ #include