diff options
| author | Heinrich Schuchardt | 2019-10-26 23:45:08 +0200 |
|---|---|---|
| committer | Tom Rini | 2019-11-07 18:01:13 -0500 |
| commit | 68c0912bf25d71e48f0775051b58443ad35faf23 (patch) | |
| tree | c3af8a284a760f2a21b98e6bf383eccd18237967 | |
| parent | bb71a2d9dcd9c53aa4d4b8e4d26c24d9b59b74c3 (diff) | |
hush: re-sequence includes
'make tests' on a 32bit ARM system leads to
In file included from ../common/cli_hush.c:79:
../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 ../common/cli_hush.c:78:
../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 ../common/cli_hush.c:79:
../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 ../common/cli_hush.c:78:
../include/linux/string.h:106:15:
note: previous declaration of ‘memcpy’ was here
extern void * memcpy(void *,const void *,__kernel_size_t);
^~~~~~
According to the U-Boot coding style guide common.h should be the first
include.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | common/cli_hush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cli_hush.c b/common/cli_hush.c index 8f86e4aa4a4..cf1e273485c 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -75,10 +75,10 @@ #define __U_BOOT__ #ifdef __U_BOOT__ +#include <common.h> /* readline */ #include <env.h> #include <malloc.h> /* malloc, free, realloc*/ #include <linux/ctype.h> /* isalpha, isdigit */ -#include <common.h> /* readline */ #include <console.h> #include <bootretry.h> #include <cli.h> |