From 2e680f92b888b4cb2fde2b0c77cbde22b48933f5 Mon Sep 17 00:00:00 2001 From: York Sun Date: Wed, 16 Dec 2015 14:12:24 +0800 Subject: Revert "include/linux: move typdef for uintptr_t" This reverts commit e8f954a756a825130d11b9c8fca70101dd8b3ac5, which causes compiling errors on 32-bit hosts. Acked-by: Aneesh Bansal Signed-off-by: York Sun --- include/compiler.h | 3 +++ include/linux/types.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/compiler.h b/include/compiler.h index f853ed4..47c296e 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -115,6 +115,9 @@ typedef unsigned int uint; #ifdef CONFIG_USE_STDINT /* Provided by gcc. */ #include +#else +/* Type for `void *' pointers. */ +typedef unsigned long int uintptr_t; #endif #include diff --git a/include/linux/types.h b/include/linux/types.h index c7e8fdb..6f75be4 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -124,7 +124,6 @@ typedef __UINT64_TYPE__ u_int64_t; typedef __INT64_TYPE__ int64_t; #endif -typedef unsigned long uintptr_t; /* * Below are truly Linux-specific types that should never collide with * any application/library that wants linux/types.h. -- cgit v1.1