From d2bf1152c078e7db7ffade193da8cfb1b8430ce0 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada <yamada.masahiro@socionext.com> Date: Sun, 21 Jan 2018 19:19:15 +0900 Subject: [PATCH] tools: include necessary headers explicitly Several host-tools use "bool" type without including <stdbool.h>. This relies on the crappy header inclusion chain. tools/Makefile has the following line: HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ All host-tools are forced to include libfdt_env.h even if they are totally unrelated to FDT. Then, <stdbool.h> is indirectly included as follows: include/libfdt_env.h -> include/linux/types.h -> <stdbool.h> I am fixing this horrible crap. In advance, I need to add necessary include directives explicitly. tools/fdtgrep.c needs more; <fctl.h> for open() and <errno.h> for errno. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Glass <sjg@chromium.org> --- tools/fdtgrep.c | 3 +++ tools/gen_ethaddr_crc.c | 1 + tools/ifdtool.c | 1 + tools/imagetool.h | 1 + tools/mips-relocs.c | 1 + 5 files changed, 7 insertions(+) diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 7af77b7afe..8d33205ea2 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -10,7 +10,10 @@ #include <assert.h> #include <ctype.h> +#include <errno.h> #include <getopt.h> +#include <fcntl.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/tools/gen_ethaddr_crc.c b/tools/gen_ethaddr_crc.c index fe9896dca9..8cf86f4835 100644 --- a/tools/gen_ethaddr_crc.c +++ b/tools/gen_ethaddr_crc.c @@ -6,6 +6,7 @@ */ #include <ctype.h> +#include <stdbool.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> diff --git a/tools/ifdtool.c b/tools/ifdtool.c index 195b1533ab..729991ee33 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -12,6 +12,7 @@ #include <assert.h> #include <fcntl.h> #include <getopt.h> +#include <stdbool.h> #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/tools/imagetool.h b/tools/imagetool.h index a8d505423b..e67de9b5ad 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -12,6 +12,7 @@ #include "os_support.h" #include <errno.h> #include <fcntl.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/tools/mips-relocs.c b/tools/mips-relocs.c index 8be69d320f..27d47308e0 100644 --- a/tools/mips-relocs.c +++ b/tools/mips-relocs.c @@ -11,6 +11,7 @@ #include <errno.h> #include <fcntl.h> #include <limits.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <sys/mman.h> -- 2.39.5