summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-04-29 20:46:14 +0000
committerKen Raeburn <raeburn@mit.edu>2003-04-29 20:46:14 +0000
commitea225b8f32da2d8571a01ff8cd937b0495a6cc30 (patch)
treee053f29087d5349530852e8ecc651aa8e2a6da5c /src/lib
parent6eb88d3b13160c110d92079ef2324161502b9ddf (diff)
downloadkrb5-ea225b8f32da2d8571a01ff8cd937b0495a6cc30.tar.gz
krb5-ea225b8f32da2d8571a01ff8cd937b0495a6cc30.tar.xz
krb5-ea225b8f32da2d8571a01ff8cd937b0495a6cc30.zip
AES code shouldn't define uint32_t etc if the system provides them
Use inttypes.h if available. ticket: new status: open target_version: 1.3 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15383 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/crypto/aes/ChangeLog4
-rw-r--r--src/lib/crypto/aes/uitypes.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/crypto/aes/ChangeLog b/src/lib/crypto/aes/ChangeLog
index 3af490304..d740ffd6b 100644
--- a/src/lib/crypto/aes/ChangeLog
+++ b/src/lib/crypto/aes/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-29 Ken Raeburn <raeburn@mit.edu>
+
+ * uitypes.h: Use inttypes.h if HAVE_INTTYPES_H is defined.
+
2003-04-13 Ken Raeburn <raeburn@mit.edu>
* aes_s2k.c (krb5int_aes_string_to_key): Return an error if the
diff --git a/src/lib/crypto/aes/uitypes.h b/src/lib/crypto/aes/uitypes.h
index 4e50ef7df..02dd3b072 100644
--- a/src/lib/crypto/aes/uitypes.h
+++ b/src/lib/crypto/aes/uitypes.h
@@ -44,7 +44,7 @@
#endif
#endif
-#if defined HAS_INTTYPES_H
+#if defined HAS_INTTYPES_H || defined HAVE_INTTYPES_H
#include <inttypes.h>
#define s_u32 u
#define s_u64 ull