From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 25 Jul 2018 09:55:25 +0800 Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error Fix build on qemumips64(el) taken from: [PATCH] libldb: fix musl libc conflicting types error /third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' typedef unsigned int uintptr_t; ^~~~~~~~~ use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined Upstream-Status: Pending Signed-off-by: Changqing Li Signed-off-by: Andrea Adami --- third_party/cmocka/cmocka.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h index 4fd82a9..5443a08 100644 --- a/third_party/cmocka/cmocka.h +++ b/third_party/cmocka/cmocka.h @@ -110,7 +110,7 @@ typedef uintmax_t LargestIntegralType; ((LargestIntegralType)(value)) /* Smallest integral type capable of holding a pointer. */ -#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) +#if !defined(__DEFINED_uintptr_t) # if defined(_WIN32) /* WIN32 is an ILP32 platform */ typedef unsigned int uintptr_t; @@ -134,9 +134,8 @@ typedef uintmax_t LargestIntegralType; # endif /* __WORDSIZE */ # endif /* _WIN32 */ -# define _UINTPTR_T -# define _UINTPTR_T_DEFINED -#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ +# define __DEFINED_uintptr_t +#endif /* !defined(__DEFINED_uintptr_t) */ /* Perform an unsigned cast to uintptr_t. */ #define cast_to_pointer_integral_type(value) \ -- 2.7.4