From 9f06966a7b17c99bc44e15e3a13f6cf92a4e49b7 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Mon, 3 Dec 2012 21:31:04 +0100 Subject: gallium/u_blitter: fix conflict with u_memory.h Reviewed-by: Brian Paul --- src/gallium/auxiliary/util/u_blitter.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/gallium/auxiliary/util') diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h index b96e68e9310..99175409be7 100644 --- a/src/gallium/auxiliary/util/u_blitter.h +++ b/src/gallium/auxiliary/util/u_blitter.h @@ -29,10 +29,14 @@ #include "util/u_framebuffer.h" #include "util/u_inlines.h" -#include "util/u_memory.h" #include "pipe/p_state.h" +/* u_memory.h conflicts with st/mesa */ +#ifndef Elements +#define Elements(x) (sizeof(x)/sizeof((x)[0])) +#endif + #ifdef __cplusplus extern "C" { -- cgit v1.2.3