diff options
| author | Marek Olšák <[email protected]> | 2012-12-03 21:31:04 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-12-07 14:19:28 +0100 |
| commit | 9f06966a7b17c99bc44e15e3a13f6cf92a4e49b7 (patch) | |
| tree | b5de7aefdf84f64644e5ffb2d1b47f30995c72a8 /src/gallium/auxiliary | |
| parent | 49f1104c449fb51ec4cc18aa5bd814afeb632415 (diff) | |
gallium/u_blitter: fix conflict with u_memory.h
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.h | 6 |
1 files changed, 5 insertions, 1 deletions
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" { |