* [tip:perf/urgent] perf tools: Move HAS_BOOL define to where perl headers are used
@ 2017-05-03 17:35 tip-bot for Arnaldo Carvalho de Melo
0 siblings, 0 replies; only message in thread
From: tip-bot for Arnaldo Carvalho de Melo @ 2017-05-03 17:35 UTC (permalink / raw)
To: linux-tip-commits
Cc: mingo, wangnan0, tglx, namhyung, linux-kernel, jolsa, dsahern,
acme, hpa, adrian.hunter
Commit-ID: 7de96c3e759e49b1d176722ed26c14c057bac34f
Gitweb: http://git.kernel.org/tip/7de96c3e759e49b1d176722ed26c14c057bac34f
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Wed, 26 Apr 2017 15:27:52 -0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 26 Apr 2017 15:27:52 -0300
perf tools: Move HAS_BOOL define to where perl headers are used
This is a perl specific hack, so move it from util.h to where perl
headers are used.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-4igctbinuom2sr6g4b03jqht@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/scripting-engines/trace-event-perl.c | 4 +++-
tools/perf/util/util.h | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 2b12bdb..7b79c41 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -28,7 +28,9 @@
#include <linux/bitmap.h>
#include <linux/time64.h>
-#include "../util.h"
+#include <stdbool.h>
+/* perl needs the following define, right after including stdbool.h */
+#define HAS_BOOL
#include <EXTERN.h>
#include <perl.h>
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 6855c45..622c2d2 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -5,7 +5,6 @@
#define _BSD_SOURCE 1
/* glibc 2.20 deprecates _BSD_SOURCE in favour of _DEFAULT_SOURCE */
#define _DEFAULT_SOURCE 1
-#define HAS_BOOL
#include <fcntl.h>
#include <stdbool.h>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-05-03 17:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-03 17:35 [tip:perf/urgent] perf tools: Move HAS_BOOL define to where perl headers are used tip-bot for Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox