LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org, Thomas Renninger <trenn@suse.de>,
	Ingo Molnar <mingo@elte.hu>,
	arjan@infradead.org, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 6/6] perf tools: Fix time function double declaration with glibc
Date: Sat, 22 Jan 2011 23:56:18 -0200	[thread overview]
Message-ID: <1295747778-26186-7-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1295747778-26186-1-git-send-email-acme@infradead.org>

From: Thomas Renninger <trenn@suse.de>

It's enough to include the local "debug.h" file to trigger it.

man time reveals this is already declared in glibc:

time - get time in seconds
-> rename the variable.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: arjan@infradead.org
LPU-Reference: <1295620209-13859-2-git-send-email-trenn@suse.de>
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/svghelper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c
index 805220a..fb737fe 100644
--- a/tools/perf/util/svghelper.c
+++ b/tools/perf/util/svghelper.c
@@ -44,11 +44,11 @@ static double cpu2y(int cpu)
 	return cpu2slot(cpu) * SLOT_MULT;
 }
 
-static double time2pixels(u64 time)
+static double time2pixels(u64 __time)
 {
 	double X;
 
-	X = 1.0 * svg_page_width * (time - first_time) / (last_time - first_time);
+	X = 1.0 * svg_page_width * (__time - first_time) / (last_time - first_time);
 	return X;
 }
 
-- 
1.6.2.5


  parent reply	other threads:[~2011-01-23  1:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-23  1:56 [GIT PULL 0/6] perf/urgent build fixes for some environments Arnaldo Carvalho de Melo
2011-01-23  1:56 ` [PATCH 1/6] perf test: Fix build on older glibcs Arnaldo Carvalho de Melo
2011-01-23  8:29   ` Eric Dumazet
2011-01-23 13:00     ` Arnaldo Carvalho de Melo
2011-01-23  1:56 ` [PATCH 2/6] perf tools: Fix 64 bit integer format strings Arnaldo Carvalho de Melo
2011-01-23  1:56 ` [PATCH 3/6] perf tools: Add missing header, fixes build Arnaldo Carvalho de Melo
2011-01-23  1:56 ` [PATCH 4/6] perf tools: Fix build when using gcc 3.4.6 Arnaldo Carvalho de Melo
2011-01-23  1:56 ` [PATCH 5/6] perf tools: Fix build by checking if extra warnings are supported Arnaldo Carvalho de Melo
2011-01-23  1:56 ` Arnaldo Carvalho de Melo [this message]
2011-01-23 15:04 ` [GIT PULL 0/6] perf/urgent build fixes for some environments Ingo Molnar

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=1295747778-26186-7-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=arjan@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=trenn@suse.de \
    --subject='Re: [PATCH 6/6] perf tools: Fix time function double declaration with glibc' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).