summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-03-25 15:03:41 -0700
committerRonald G. Minnich <rminnich@gmail.com>2013-03-26 19:36:39 +0100
commitc7b6d7db092cfd925f1fb6333e166a54663310e7 (patch)
treed688ad6085d160b22da067aa11bc43b731f8e088
parente21f5e14834af6426bd6fc3e7f37f6b18243f416 (diff)
downloadcoreboot-c7b6d7db092cfd925f1fb6333e166a54663310e7.tar.xz
libpayload: Fix type issues
There were a number of type issues in libpayload that sneaked in with 903f8e0. - size_t and ssize_t were conflicting with gcc builtins - some stdint types were used in libpayload but not defined in our stdint.h With this patch it's possible to compile libpayload with the reference toolchain again. Change-Id: Idd5ccfdd9f3536b36bceca2d101e7405883b10bc Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2903 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--payloads/libpayload/include/armv7/arch/types.h4
-rw-r--r--payloads/libpayload/include/stdint.h8
-rw-r--r--payloads/libpayload/include/x86/arch/types.h4
3 files changed, 12 insertions, 4 deletions
diff --git a/payloads/libpayload/include/armv7/arch/types.h b/payloads/libpayload/include/armv7/arch/types.h
index d6f4aa8b66..bb4025714f 100644
--- a/payloads/libpayload/include/armv7/arch/types.h
+++ b/payloads/libpayload/include/armv7/arch/types.h
@@ -53,8 +53,8 @@ typedef signed long long s64;
typedef long time_t;
typedef long suseconds_t;
-typedef unsigned int size_t;
-typedef int ssize_t;
+typedef unsigned long size_t;
+typedef long ssize_t;
#ifndef NULL
#define NULL ((void *)0)
diff --git a/payloads/libpayload/include/stdint.h b/payloads/libpayload/include/stdint.h
index dd7439d788..966a1ed996 100644
--- a/payloads/libpayload/include/stdint.h
+++ b/payloads/libpayload/include/stdint.h
@@ -29,8 +29,16 @@
#ifndef __STDINT_H
#define __STDINT_H
+
#include <arch/types.h>
+typedef long long int intmax_t;
+typedef unsigned long long uintmax_t;
+
typedef unsigned long uintptr_t;
typedef long intptr_t;
+
+#define UINT32_MAX (4294967295U)
+#define UINT64_MAX (18446744073709551615ULL)
+
#endif
diff --git a/payloads/libpayload/include/x86/arch/types.h b/payloads/libpayload/include/x86/arch/types.h
index d6f4aa8b66..bb4025714f 100644
--- a/payloads/libpayload/include/x86/arch/types.h
+++ b/payloads/libpayload/include/x86/arch/types.h
@@ -53,8 +53,8 @@ typedef signed long long s64;
typedef long time_t;
typedef long suseconds_t;
-typedef unsigned int size_t;
-typedef int ssize_t;
+typedef unsigned long size_t;
+typedef long ssize_t;
#ifndef NULL
#define NULL ((void *)0)