pull up r17441 from trunk

ticket: 3212
version_fixed: 1.4.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17444 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index c553286b6948b0e657f0fc363a30539eff73a4c4..f85a55e2493c8fcdd7bdc37406cd79b291671c15 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-20  Jeffrey Altman <jaltman@mit.edu>
+
+       * win-mac.h: Add definitions for int32_t and uint32_t
+
 2005-05-31  Ken Raeburn  <raeburn@mit.edu>
 
        * k5-thread.h (krb5int_pthread_loaded) [HAVE_PRAGMA_WEAK_REF]:

diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index 0b58a9c4d677eabd97279f940024926003ffa482..ec39b528f3f044c8ead0a53da4eaa1ab8699ada3 100644 (file)
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -57,6 +57,8 @@ typedef unsigned long u_long;      /* Not part of sys/types.h on the pc */
 typedef unsigned int   u_int;
 typedef unsigned short u_short;
 typedef unsigned char  u_char;
+typedef unsigned int    uint32_t;
+typedef int             int32_t;
 #endif /* KRB5_SYSTYPES__ */
 
 #define MAXHOSTNAMELEN  512