Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "include/linux: move typdef for uintptr_t"

Browse source 
This reverts commit e8f954a756, which
causes compiling errors on 32-bit hosts.

Acked-by: Aneesh Bansal <aneesh.bansal@freescale.com>
Signed-off-by: York Sun <yorksun@freescale.com>
This commit is contained in:
York Sun 2015-12-16 14:12:24 +08:00 • committed by Tom Rini
parent e6e3faa5c2
commit 2e680f92b8
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/compiler.h
View file

@ -115,6 +115,9 @@ typedef unsigned int uint;
#ifdef CONFIG_USE_STDINT #ifdef CONFIG_USE_STDINT
/* Provided by gcc. */ /* Provided by gcc. */
#include <stdint.h> #include <stdint.h>
#else
/* Type for `void *' pointers. */
typedef unsigned long int uintptr_t;
#endif #endif
#include <linux/string.h> #include <linux/string.h>

1
include/linux/types.h
View file

@ -124,7 +124,6 @@ typedef __UINT64_TYPE__ u_int64_t;
typedef __INT64_TYPE__ int64_t; typedef __INT64_TYPE__ int64_t;
#endif #endif
typedef unsigned long uintptr_t;
/* /*
* Below are truly Linux-specific types that should never collide with * Below are truly Linux-specific types that should never collide with
* any application/library that wants linux/types.h. * any application/library that wants linux/types.h.