diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 18:54:33 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 18:54:33 -0700 |
| commit | d5ca33ca2dd08e8436439da926d2dedaabc268fa (patch) | |
| tree | 3a6cd482ce906968ecb461259bc8b0fff49646d8 /miext | |
| parent | 38d55f06cfbf4b05fee0aef8f97f90e835beaacb (diff) | |
| parent | 4edf49d032028aa4b9887d02b926b0c372c4451d (diff) | |
Merge remote-tracking branch 'kibi/master'
Diffstat (limited to 'miext')
| -rw-r--r-- | miext/shadow/shpacked.c | 2 | ||||
| -rw-r--r-- | miext/shadow/shplanar.c | 2 | ||||
| -rw-r--r-- | miext/shadow/shplanar8.c | 2 | ||||
| -rw-r--r-- | miext/shadow/shrotate.c | 2 | ||||
| -rw-r--r-- | miext/shadow/shrotpack.h | 2 | ||||
| -rw-r--r-- | miext/shadow/shrotpackYX.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 06606bcf3..c37dca175 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -52,7 +52,7 @@ shadowUpdatePacked (ScreenPtr pScreen, FbStride shaStride; int scrBase, scrLine, scr; int shaBpp; - int shaXoff, shaYoff; /* XXX assumed to be zero */ + _X_UNUSED int shaXoff, shaYoff; int x, y, w, h, width; int i; FbBits *winBase = NULL, *win; diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index 9ca3f3f89..350405186 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -98,7 +98,7 @@ shadowUpdatePlanar4 (ScreenPtr pScreen, FbStride shaStride; int scrBase, scrLine, scr; int shaBpp; - int shaXoff, shaYoff; /* XXX assumed to be zero */ + _X_UNUSED int shaXoff, shaYoff; int x, y, w, h, width; int i; CARD32 *winBase = NULL, *win; diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index f8b255d8f..d0648147a 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -102,7 +102,7 @@ shadowUpdatePlanar4x8 (ScreenPtr pScreen, FbStride shaStride; int scrBase, scrLine, scr; int shaBpp; - int shaXoff, shaYoff; /* XXX assumed to be zero */ + _X_UNUSED int shaXoff, shaYoff; int x, y, w, h, width; int i; CARD32 *winBase = NULL, *win; diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index c3898266c..090120387 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -59,7 +59,7 @@ shadowUpdateRotatePacked (ScreenPtr pScreen, FbBits *shaBits; FbStride shaStride; int shaBpp; - int shaXoff, shaYoff; + _X_UNUSED int shaXoff, shaYoff; int box_x1, box_x2, box_y1, box_y2; int sha_x1 = 0, sha_y1 = 0; int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h; diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index 2d1a87c19..16afff184 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -106,7 +106,7 @@ FUNC (ScreenPtr pScreen, FbStride shaStride; int scrBase, scrLine, scr; int shaBpp; - int shaXoff, shaYoff; /* XXX assumed to be zero */ + _X_UNUSED int shaXoff, shaYoff; int x, y, w, h, width; int i; Data *winBase = NULL, *win; diff --git a/miext/shadow/shrotpackYX.h b/miext/shadow/shrotpackYX.h index 7d36bd1bd..d7b01ec2a 100644 --- a/miext/shadow/shrotpackYX.h +++ b/miext/shadow/shrotpackYX.h @@ -69,7 +69,7 @@ FUNC (ScreenPtr pScreen, Data *shaBase, *shaLine, *sha; FbStride shaStride, winStride; int shaBpp; - int shaXoff, shaYoff; /* XXX assumed to be zero */ + _X_UNUSED int shaXoff, shaYoff; int x, y, w, h; Data *winBase, *win, *winLine; CARD32 winSize; |