diff options
| author | Heinrich Schuchardt | 2019-10-26 23:53:48 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt | 2019-10-30 17:49:41 +0100 |
| commit | e731af4893f7741c66254161ad9b6f5280369895 (patch) | |
| tree | 484b470cd0029754af021ba93f83844d794967b2 /lib | |
| parent | 051aa89f46ca2412e91555df7a60a8bb604c5e29 (diff) | |
efi_loader: correct includes in efi_variable.c
'make tests' on an 32bit ARM system leads to
In file included from ../lib/efi_loader/efi_variable.c:9:
../include/malloc.h:364:7: error: conflicting types for ‘memset’
void* memset(void*, int, size_t);
^~~~~~
In file included from ../include/compiler.h:126,
from ../include/env.h:12,
from ../lib/efi_loader/efi_variable.c:8:
../include/linux/string.h:103:15:
note: previous declaration of ‘memset’ was here
extern void * memset(void *,int,__kernel_size_t);
^~~~~~
In file included from ../lib/efi_loader/efi_variable.c:9:
../include/malloc.h:365:7: error: conflicting types for ‘memcpy’
void* memcpy(void*, const void*, size_t);
^~~~~~
In file included from ../include/compiler.h:126,
from ../include/env.h:12,
from ../lib/efi_loader/efi_variable.c:8:
../include/linux/string.h:106:15:
note: previous declaration of ‘memcpy’ was here
extern void * memcpy(void *,const void *,__kernel_size_t);
^~~~~~
Use common.h as first include as recommended by the U-Boot coding style
guide.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_variable.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index d0daf7bdebb..46f35bc60ba 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -5,14 +5,12 @@ * Copyright (c) 2017 Rob Clark */ -#include <env.h> -#include <malloc.h> -#include <charset.h> +#include <common.h> #include <efi_loader.h> -#include <hexdump.h> #include <env_internal.h> +#include <hexdump.h> +#include <malloc.h> #include <search.h> -#include <uuid.h> #define READ_ONLY BIT(31) |