From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 29 Apr 2003 20:46:14 +0000 (+0000)
Subject: AES code shouldn't define uint32_t etc if the system provides them
X-Git-Tag: krb5-1.4-beta1~991
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea225b8f32da2d8571a01ff8cd937b0495a6cc30;p=krb5.git

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
---

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