diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-25 08:20:54 -0500 |
| commit | 53e0fef5a74ac10618da083a01bbf97b4387a3dd (patch) | |
| tree | 2e3d22c903796c967a4855a27f996b7705603c74 /include/malloc.h | |
| parent | cbe607b920bc0827d8fe379ed4f5ae4e2058513e (diff) | |
| parent | 2f7aa89703738b0c37e34120319bab567a8672bd (diff) | |
Merge branch '2021-02-24-assorted-fixes'
- squashfs, btrfs fixes
- Kconfig CONFIG logic fixes
- hikey DM migration
- Some portability fixes for the build system
- Assorted code cleanups
Diffstat (limited to 'include/malloc.h')
| -rw-r--r-- | include/malloc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/malloc.h b/include/malloc.h index f66c2e86176..e15e528a2e3 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 <linux/string.h> #else #ifdef WIN32 /* On Win32 platforms, 'memset()' and 'memcpy()' are already declared in */ |