gallium/u_blitter: fix conflict with u_memory.h

Reviewed-by: Brian Paul <brianp@vmware.com>
2012-12-03 21:31:04 +01:00
parent 49f1104c44
commit 9f06966a7b
3 changed files with 7 additions and 1 deletions
@@ -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" {
@@ -27,6 +27,7 @@
 #include "pipe/p_shader_tokens.h"
 #include "util/u_blitter.h"
 #include "util/u_format_s3tc.h"
+#include "util/u_memory.h"
 #include "util/u_simple_shaders.h"
 #include "util/u_upload_mgr.h"
 #include "vl/vl_decoder.h"
@@ -30,6 +30,7 @@

 #include "util/u_draw_quad.h"
 #include "util/u_index_modify.h"
+#include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
 #include "tgsi/tgsi_parse.h"
 #include <byteswap.h>