From: Simon Glass <sjg@chromium.org>
Date: Fri, 4 Nov 2011 06:42:35 +0000 (+0000)
Subject: Define uintptr_t as long int to simplify printf() format strings
X-Git-Tag: v2011.12-rc1~152
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c9502f4914c505a2cf8476202fc7d24304cca959;p=oweals%2Fu-boot.git

Define uintptr_t as long int to simplify printf() format strings

If uintptr_t can be either an unsigned int or an unsigned long int, it is
tricky to use it in a printf() format string. This changes it to
unsigned long int consistently. This should do the right thing on both
32-bit and 64-bit architectures.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/include/compiler.h b/include/compiler.h
index 54999a7e82..0734ed4942 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -123,16 +123,10 @@ typedef unsigned int uint;
 #define __WORDSIZE	32
 #endif
 
-/* Types for `void *' pointers. */
-#if __WORDSIZE == 64
-typedef unsigned long int       uintptr_t;
-#elif __WORDSIZE == 32
-typedef unsigned int            uintptr_t;
-#else
-#error "__WORDSIZE has unexpected value"
-#endif
+/* Type for `void *' pointers. */
+typedef unsigned long int uintptr_t;
 
-#endif
+#endif /* USE_HOSTCC */
 
 /* compiler options */
 #define uninitialized_var(x)		x = x