linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Ahern <dsahern@gmail.com>
To: Irina Tirdea <irina.tirdea@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>,
	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
	Ingo Molnar <mingo@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: [PATCH 05/13] perf tools: fix ALIGN redefinition in system headers
Date: Wed, 29 Aug 2012 10:24:46 -0600	[thread overview]
Message-ID: <503E424E.6080606@gmail.com> (raw)
In-Reply-To: <CANg8OWLpEOgWyqdzki-VensP0aKqAgYmJ68qUzZQrsX4tiFT1Q@mail.gmail.com>

On 8/28/12 4:02 PM, Irina Tirdea wrote:
> On some systems (e.g. Android), ALIGN is defined in
> system headers as ALIGN(p). The definition of ALIGN used
> in perf takes 2 parameters: ALIGN(x,a). This leads to
> redefinition conflicts.
>
> Redefinition error on Android:
> In file included from util/include/linux/list.h:1:0,
> from util/callchain.h:5,
> from util/hist.h:6,
> from util/session.h:4,
> from util/build-id.h:4,
> from util/annotate.c:11:
> util/include/linux/kernel.h:11:0: error: "ALIGN" redefined [-Werror]
> bionic/libc/include/sys/param.h:38:0: note: this is the location of
> the previous definition
>

Simpler to undef ALIGN in util/include/linux/kernel.h right before the 
perf version is declared.

David


  reply	other threads:[~2012-08-29 16:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-28 22:02 [PATCH 05/13] perf tools: fix ALIGN redefinition in system headers Irina Tirdea
2012-08-29 16:24 ` David Ahern [this message]
2012-09-02 20:20   ` Irina Tirdea

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=503E424E.6080606@gmail.com \
    --to=dsahern@gmail.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@ghostprotocols.net \
    --cc=fweisbec@gmail.com \
    --cc=irina.tirdea@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).