* 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 0b820c61127b52b29080f931351c6aeda35b37ff..43cb228ba8b21209c884a1895440855d982729d7 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 00:49:37 1997  Sam Hartman  <hartmans@tertius.mit.edu>
+
+       * 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  <basch@lehman.com>
 
        * configure.in: awk is required by the Makefile

diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 1040facf26ddb876a1ad9a1674e3fe0c43c3a9c5..ffe887931dc605a77e219beb97e94537f07beb92 100644 (file)
--- 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 <sys/types.h>