From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754074AbdECRiN (ORCPT ); Wed, 3 May 2017 13:38:13 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52817 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333AbdECRiA (ORCPT ); Wed, 3 May 2017 13:38:00 -0400 Date: Wed, 3 May 2017 10:35:45 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, jolsa@kernel.org, dsahern@gmail.com, acme@redhat.com, hpa@zytor.com, adrian.hunter@intel.com Reply-To: hpa@zytor.com, jolsa@kernel.org, dsahern@gmail.com, acme@redhat.com, adrian.hunter@intel.com, namhyung@kernel.org, wangnan0@huawei.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Move HAS_BOOL define to where perl headers are used Git-Commit-ID: 7de96c3e759e49b1d176722ed26c14c057bac34f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7de96c3e759e49b1d176722ed26c14c057bac34f Gitweb: http://git.kernel.org/tip/7de96c3e759e49b1d176722ed26c14c057bac34f Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 26 Apr 2017 15:27:52 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-4igctbinuom2sr6g4b03jqht@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 #include -#include "../util.h" +#include +/* perl needs the following define, right after including stdbool.h */ +#define HAS_BOOL #include #include 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 #include