From c6bf4f38988996f12c69a1cb5470bf9bea7c88ce Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 10 Feb 2021 18:59:21 +0100 Subject: [PATCH] malloc: adjust memcpy() and memset() definitions. Compiling the sandbox fails on armv7 due to conflicting definitions of memcpy() and memset() in include/malloc.h and include/linux/string.h. Use linux/string.h here. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/malloc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/malloc.h b/include/malloc.h index f66c2e8617..e15e528a2e 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -361,8 +361,11 @@ extern "C" { #if (__STD_C || defined(HAVE_MEMCPY)) #if __STD_C +/* U-Boot defines memset() and memcpy in /include/linux/string.h void* memset(void*, int, size_t); void* memcpy(void*, const void*, size_t); +*/ +#include #else #ifdef WIN32 /* On Win32 platforms, 'memset()' and 'memcpy()' are already declared in */