Provide option to avoid defining a custom version of uintptr_t.

[platform/kernel/u-boot.git] / arch / x86 / include / asm / types.h

diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index e9fde88..e272c90 100644 (file)
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -36,8 +36,13 @@ typedef unsigned short u16;
 typedef signed int s32;
 typedef unsigned int u32;
 
+#if !defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__)
 typedef signed long long s64;
 typedef unsigned long long u64;
+#else
+typedef __INT64_TYPE__ s64;
+typedef __UINT64_TYPE__ u64;
+#endif
 
 #define BITS_PER_LONG 32