andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "warning: left-hand operand of comma expression has no effect" 

Signed-off-by: Eamon Walsh <efw@eamonwalsh.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Eamon Walsh 2009-09-04 21:49:29 -04:00 committed by Peter Hutterer
parent 9005ec4ce1
commit 1bdc9ec617
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fb/fb.h
View File

@ -487,22 +487,34 @@ extern _X_EXPORT 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 ? (void) \
WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), \
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 ? (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 ? (void) (*(FbBits *) ((a)+(o)) = fgxor) : \
((void)FbLaneCase4((n)&15,a,o), \
FbLaneCase4((n)>>4,a,(o)+4)))
#define FbLaneCase1(n,a,o) \
if ((n) == 0x01) { \
WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), fgxor); \
}
#define FbLaneCase2(n,a,o) \
if ((n) == 0x03) { \
WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), fgxor); \
} else { \
FbLaneCase1((n)&1,a,o) \
FbLaneCase1((n)>>1,a,(o)+1) \
}
#define FbLaneCase4(n,a,o) \
if ((n) == 0x0f) { \
WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), fgxor); \
} else { \
FbLaneCase2((n)&3,a,o) \
FbLaneCase2((n)>>2,a,(o)+2) \
}
#define FbLaneCase8(n,a,o) \
if ((n) == 0x0ff) { \
*(FbBits *) ((a)+(o)) = fgxor; \
} else { \
FbLaneCase4((n)&15,a,o) \
FbLaneCase4((n)>>4,a,(o)+4) \
}
#if FB_SHIFT == 6
#define FbLaneCase(n,a) FbLaneCase8(n,(CARD8 *) (a),0)

2
fb/fbbltone.c
View File

@ -59,7 +59,7 @@
#ifndef FBNOPIXADDR
#define LaneCases1(n,a) case n: (void)FbLaneCase(n,a); break
#define LaneCases1(n,a) case n: FbLaneCase(n,a); break
#define LaneCases2(n,a) LaneCases1(n,a); LaneCases1(n+1,a)
#define LaneCases4(n,a) LaneCases2(n,a); LaneCases2(n+2,a)
#define LaneCases8(n,a) LaneCases4(n,a); LaneCases4(n+4,a)

2
fb/fbstipple.c
View File

@ -33,7 +33,7 @@
* transparent stipple
*/
#define LaneCases1(c,a) case c: \
while (n--) { (void)FbLaneCase(c,a); a++; } \
while (n--) { FbLaneCase(c,a); a++; } \
break
#define LaneCases2(c,a) LaneCases1(c,a); LaneCases1(c+1,a)
#define LaneCases4(c,a) LaneCases2(c,a); LaneCases2(c+2,a)