dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-17 16:42:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

malloc: adjust memcpy() and memset() definitions.

Browse Source 
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 <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt
2021-02-10 18:59:21 +01:00
committed by Tom Rini
parent db5f1a50ef
commit c6bf4f3898
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/malloc.h
View File

@@ -361,8 +361,11 @@ extern "C" {
#if (__STD_C || defined(HAVE_MEMCPY)) #if (__STD_C || defined(HAVE_MEMCPY))
#if __STD_C #if __STD_C
/* U-Boot defines memset() and memcpy in /include/linux/string.h
void* memset(void*, int, size_t); void* memset(void*, int, size_t);
void* memcpy(void*, const void*, size_t); void* memcpy(void*, const void*, size_t);
*/
#include <linux/string.h>
#else #else
#ifdef WIN32 #ifdef WIN32
/* On Win32 platforms, 'memset()' and 'memcpy()' are already declared in */ /* On Win32 platforms, 'memset()' and 'memcpy()' are already declared in */