[Mesa-dev] [PATCH 06/12] mesa: Consolidate likely/unlikely macros.

[Matt Turner]

On Mon, Sep 22, 2014 at 12:13 PM, Jason Ekstrand <jason at jlekstrand.net> wrote:
>
>
> On Mon, Sep 22, 2014 at 11:51 AM, Matt Turner <mattst88 at gmail.com> wrote:
>>
>> ---
>>  src/gallium/include/pipe/p_compiler.h     | 45
>> +------------------------------
>>  src/mapi/u_compiler.h                     | 10 -------
>>  src/mesa/drivers/dri/i915/intel_context.h | 10 -------
>>  src/util/macros.h                         | 32 ++++++++++++++++++++++
>>  4 files changed, 33 insertions(+), 64 deletions(-)
>>
>> diff --git a/src/gallium/include/pipe/p_compiler.h
>> b/src/gallium/include/pipe/p_compiler.h
>> index 939fb06..4ed6a4b 100644
>> --- a/src/gallium/include/pipe/p_compiler.h
>> +++ b/src/gallium/include/pipe/p_compiler.h
>> @@ -30,6 +30,7 @@
>>
>>
>>  #include "c99_compat.h" /* inline, __func__, etc. */
>> +#include "../../../util/macros.h"
>
>
> Do we really need all those ".."s?  Seems to me like we should add something
> to Makefile.am instead.

Unclear, since there's already a util/ directory in the include path.
Probably leave these ../ like they are until we can combine the util
directories?