diff options
author | Siyuan Wang <wangsiyuanbuaa@gmail.com> | 2012-10-19 21:02:39 +0800 |
---|---|---|
committer | Patrick Georgi <patrick@georgi-clan.de> | 2012-10-22 21:49:02 +0200 |
commit | eb825725ce9e9765b5370008d65829f2aa1aa550 (patch) | |
tree | 21b64a80cc4a784994bdae9b8c9c1a2b6cbe4937 /src/vendorcode/amd | |
parent | fba86bfaa8a308ed6ca3daa66e27f1c10dd4c016 (diff) | |
download | coreboot-eb825725ce9e9765b5370008d65829f2aa1aa550.tar.xz |
change conflicted typedef in src/vendorcode/amd/agesa/f15/Porting.h
src/vendorcode/amd/agesa/f15/Porting.h has some conflicted typedef with
src/include/cpu/amd/common/cbtypes.h. These conflicted defines can lead to errors.
Change-Id: Idad0794018bf0bd0e4e52a5aa062a12766d56c8e
Signed-off-by: Siyuan Wang <SiYuan.Wang@amd.com>
Signed-off-by: Siyuan Wang <wangsiyuanbuaa@gmail.com>
Reviewed-on: http://review.coreboot.org/1592
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/vendorcode/amd')
-rw-r--r-- | src/vendorcode/amd/agesa/f15/Porting.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vendorcode/amd/agesa/f15/Porting.h b/src/vendorcode/amd/agesa/f15/Porting.h index 48ac3903d6..4cd8d1cb49 100644 --- a/src/vendorcode/amd/agesa/f15/Porting.h +++ b/src/vendorcode/amd/agesa/f15/Porting.h @@ -232,12 +232,12 @@ typedef unsigned char BOOLEAN; typedef signed char INT8; typedef signed short INT16; - typedef signed long INT32; - typedef unsigned char CHAR8; + typedef signed int INT32; + typedef signed char CHAR8; typedef unsigned char UINT8; typedef unsigned short UINT16; - typedef unsigned long UINT32; - typedef unsigned long UINTN; + typedef unsigned int UINT32; + typedef unsigned int UINTN; typedef unsigned long long UINT64; typedef void VOID; //typedef unsigned long size_t; |