diff options
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" { |