diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-03-15 19:49:11 +0100 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-16 02:48:07 +0200 |
| commit | 7ffc71e047c27bc59a3e957f673572202e08e959 (patch) | |
| tree | a8f12cdc9ec165fb430242fc88cdc048a0384cf0 /src/arch/x86 | |
| parent | b5bba0935fe2195df483c9d325b49b004399f0c9 (diff) | |
x86: Make stdint.h x64 proof
Change-Id: Ibcfdc08c9aac02fe263afd629fc262f71da80e9a
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Signed-off-by: Scott Duplichan <scott@notabs.org>
Reviewed-on: http://review.coreboot.org/8695
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/include/stdint.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/arch/x86/include/stdint.h b/src/arch/x86/include/stdint.h index e8453abb6a..c817e1b61f 100644 --- a/src/arch/x86/include/stdint.h +++ b/src/arch/x86/include/stdint.h @@ -1,5 +1,5 @@ -#ifndef I386_STDINT_H -#define I386_STDINT_H +#ifndef X86_STDINT_H +#define X86_STDINT_H #if defined(__GNUC__) #define __HAVE_LONG_LONG__ 1 @@ -53,8 +53,8 @@ typedef signed long long int_fast64_t; #endif /* Types for `void *' pointers. */ -typedef int intptr_t; -typedef unsigned int uintptr_t; +typedef long intptr_t; +typedef unsigned long uintptr_t; /* Largest integral types */ #if __HAVE_LONG_LONG__ @@ -85,6 +85,18 @@ typedef uint8_t bool; #ifndef UINT64_MAX # define UINT64_MAX (18446744073709551615ULL) #endif + +#ifdef __x86_64__ + +#ifndef UINT64_C +#define UINT64_C(c) c ## UL +#endif +#ifndef PRIu64 +#define PRIu64 "lu" +#endif + +#else + #ifndef UINT64_C #define UINT64_C(c) c ## ULL #endif @@ -92,7 +104,9 @@ typedef uint8_t bool; #define PRIu64 "llu" #endif +#endif + #undef __HAVE_LONG_LONG__ -#endif /* I386_STDINT_H */ +#endif /* X86_STDINT_H */ |