From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Tue, 1 Nov 2011 19:55:02 -0400
Subject: [ltt-dev] liburcu: likely and unlikely macro collision
In-Reply-To: <fc9da044-1918-4936-9d4c-b0a2a8c977cc@tahiti.vyatta.com>
References: <20111101220018.GA19730@Krystal>
	<fc9da044-1918-4936-9d4c-b0a2a8c977cc@tahiti.vyatta.com>
Message-ID: <20111101235502.GA22568@Krystal>

* Stephen Hemminger (stephen.hemminger at vyatta.com) wrote:
> 
> > likely()/unlikely() seems to be amongst the last macros that urcu
> > defines that don't have urcu-specific prefixes. Thoughts on whether
> > we
> > should add a prefix such as caa_likely() and caa_unlikely() are
> > welcome.
> 
> In our usage of liburcu, I had to do macro whacking to workaround
> this conflict.  Even wrapping the definition in urcu with '#ifndef likely'
> would help.

OK. I'll rename likely/unlikely to caa_likely/caa_unlikely.

commit a0b7f7ea3fc3339a1c42caffd53ce9f056e5b901
Author: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
Date:   Tue Nov 1 19:58:52 2011 -0400

    Rename likely/unlikely to caa_likely/caa_unlikely
    
    This fixes namespace conflicts.
    
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>

Thanks for your feedback!

Mathieu


-- 
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com