perf tools: Move HAS_BOOL define to where perl headers are used

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 3, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-05-03 17:38 UTC #0 lore raw

Commit-ID:  7de96c3e759e49b1d176722ed26c14c057bac34f
Gitweb:     http://git.kernel.org/tip/7de96c3e759e49b1d176722ed26c14c057bac34f
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 26 Apr 2017 15:27:52 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/scripting-engines/trace-event-perl.c | 4 +++-
 tools/perf/util/util.h                               | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

tools/perf/util/scripting-engines/trace-event-perl.c +3 -1

index 2b12bdb..7b79c41 100644
@@ -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>

tools/perf/util/util.h +0 -1

index 6855c45..622c2d2 100644
@@ -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>