From df800d87e04ce984a8a9ab4252ac6478ab1e4426 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 2 Oct 2006 11:28:47 -0700 Subject: [PATCH] Add (void) casts to clear compiler errors about ?: results having type mismatch --- fb/fb.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fb/fb.h b/fb/fb.h index edd9392b9..de0b3a8c2 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -488,20 +488,20 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data); * The term "lane" comes from the hardware term "byte-lane" which */ -#define FbLaneCase1(n,a,o) ((n) == 0x01 ? \ +#define FbLaneCase1(n,a,o) ((n) == 0x01 ? (void) \ WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), \ - fgxor) : 0) -#define FbLaneCase2(n,a,o) ((n) == 0x03 ? \ + fgxor) : (void) 0) +#define FbLaneCase2(n,a,o) ((n) == 0x03 ? (void) \ WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), \ fgxor) : \ ((void)FbLaneCase1((n)&1,a,o), \ FbLaneCase1((n)>>1,a,(o)+1))) -#define FbLaneCase4(n,a,o) ((n) == 0x0f ? \ +#define FbLaneCase4(n,a,o) ((n) == 0x0f ? (void) \ WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), \ fgxor) : \ ((void)FbLaneCase2((n)&3,a,o), \ FbLaneCase2((n)>>2,a,(o)+2))) -#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (*(FbBits *) ((a)+(o)) = fgxor) : \ +#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (void) (*(FbBits *) ((a)+(o)) = fgxor) : \ ((void)FbLaneCase4((n)&15,a,o), \ FbLaneCase4((n)>>4,a,(o)+4)))