[Intel-gfx] [PATCH 3/5] xvmc: Silence gcc, add parentheses around arithmetic.

[Chris Wilson]

On Mon, 31 Jan 2011 06:22:37 +0100, Cyril Brulebois <kibi at debian.org> wrote:
> Get rid of those accordingly with CFLAGS="-Wall -Werror":
> |   CC     i915_xvmc.lo
> | cc1: warnings being treated as errors
> | i915_xvmc.c: In function ‘i915_mc_one_time_state_emit’:
> | i915_xvmc.c:369: error: suggest parentheses around arithmetic in operand of ‘|’
> | i915_xvmc.c:374: error: suggest parentheses around arithmetic in operand of ‘|’
> | i915_xvmc.c:379: error: suggest parentheses around arithmetic in operand of ‘|’
> | i915_xvmc.c: In function ‘i915_mc_load_indirect_render_emit’:
> | i915_xvmc.c:708: error: suggest parentheses around arithmetic in operand of ‘|’
> | i915_xvmc.c:713: error: suggest parentheses around arithmetic in operand of ‘|’

Fix the macro instead.

diff --git a/src/xvmc/intel_batchbuffer.h b/src/xvmc/intel_batchbuffer.h
index 6fa1c05..888abeb 100644
--- a/src/xvmc/intel_batchbuffer.h
+++ b/src/xvmc/intel_batchbuffer.h
@@ -24,7 +24,7 @@ extern int VERBOSE;
 
 #define OUT_RELOC(bo,read_domains,write_domains,delta)  \
     do { \
-        *(unsigned int *)batch_ptr = delta + bo->offset; \
+        *(unsigned int *)batch_ptr = (delta) + bo->offset; \
         intel_batch_emit_reloc(bo, read_domains, write_domains, delta, batch_pt
         batch_ptr += 4;                                                 \
     } while (0)

-- 
Chris Wilson, Intel Open Source Technology Centre