You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
76 lines
2.0 KiB
Diff
76 lines
2.0 KiB
Diff
From ad23f45b346f196e07ba49d354a12762f19abfa4 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 2/2] 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/ifdtool.c | 1 +
|
|
tools/imagetool.h | 1 +
|
|
3 files changed, 5 insertions(+)
|
|
|
|
diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
|
|
index fbe38c824a41..13703fc3b1b9 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/ifdtool.c b/tools/ifdtool.c
|
|
index c805597744bd..e4c2f82c4a1e 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 15c2a0c0e1c1..076e5e0dc8f9 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>
|
|
--
|
|
2.21.0
|
|
|