mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg Price <price@MIT.EDU>
To: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Waiman Long <Waiman.Long@hp.com>, Jiri Olsa <jolsa@redhat.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] perf: Avoid missing macros FALSE, TRUE outside ui/gtk/
Date: Mon, 8 Jul 2013 08:11:50 -0400	[thread overview]
Message-ID: <20130708121148.GC15534@biohazard-cafe.mit.edu> (raw)

We use these macros in a few files in ui/gtk/ and they work fine
because GTK includes GLib which defines them, but here in util/
they break the build, at least on my machine.  So stick to 0 and 1.

Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Waiman Long <Waiman.Long@hp.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Greg Price <price@mit.edu>
---

This is based on 6d895ece5, which is currently Arnaldo's perf/core.
The offending lines were introduced in 78213177f, committed just the
other day.

Cheers,
Greg

 tools/perf/util/dso.c  | 2 +-
 tools/perf/util/vdso.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 3d80f92..b4c8624 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -531,7 +531,7 @@ struct dso *dsos__find(struct list_head *head, const char *name, bool cmp_short)
 
 struct dso *__dsos__findnew(struct list_head *head, const char *name)
 {
-	struct dso *dso = dsos__find(head, name, FALSE);
+	struct dso *dso = dsos__find(head, name, 0);
 
 	if (!dso) {
 		dso = dso__new(name);
diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
index a8fd73d..49edf93 100644
--- a/tools/perf/util/vdso.c
+++ b/tools/perf/util/vdso.c
@@ -91,7 +91,7 @@ void vdso__exit(void)
 
 struct dso *vdso__dso_findnew(struct list_head *head)
 {
-	struct dso *dso = dsos__find(head, VDSO__MAP_NAME, TRUE);
+	struct dso *dso = dsos__find(head, VDSO__MAP_NAME, 1);
 
 	if (!dso) {
 		char *file;
-- 
1.8.2

             reply	other threads:[~2013-07-08 12:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-08 12:11 Greg Price [this message]
2013-07-08 13:10 ` Jiri Olsa
2013-07-08 13:43   ` Greg Price

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130708121148.GC15534@biohazard-cafe.mit.edu \
    --to=price@mit.edu \
    --cc=Waiman.Long@hp.com \
    --cc=acme@redhat.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®