gallium/u_blitter: fix conflict with u_memory.h
authorMarek Olšák <maraeo@gmail.com>
Mon, 3 Dec 2012 20:31:04 +0000 (21:31 +0100)
committerMarek Olšák <maraeo@gmail.com>
Fri, 7 Dec 2012 13:19:28 +0000 (14:19 +0100)
commit9f06966a7b17c99bc44e15e3a13f6cf92a4e49b7
treeb5de7aefdf84f64644e5ffb2d1b47f30995c72a8
parent49f1104c449fb51ec4cc18aa5bd814afeb632415
gallium/u_blitter: fix conflict with u_memory.h

Reviewed-by: Brian Paul <brianp@vmware.com>
src/gallium/auxiliary/util/u_blitter.h
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state_common.c