diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-02 15:26:35 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-02 15:26:35 +0000 |
| commit | dbca69c8a4f3e2d1ccb4f89152213b2861b33af6 (patch) | |
| tree | f8963ef73903a7b4374adc2354dffbaa905112ac /xserver/mi/miline.h | |
| parent | 33b2029f322f3c238b7ba528083195ad8dde33e1 (diff) | |
xserver 1.5.2. tested by ckuethe@, oga@, and others.
Diffstat (limited to 'xserver/mi/miline.h')
| -rw-r--r-- | xserver/mi/miline.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xserver/mi/miline.h b/xserver/mi/miline.h index 7028485f0..036c2b5df 100644 --- a/xserver/mi/miline.h +++ b/xserver/mi/miline.h @@ -28,6 +28,7 @@ in this Software without prior written authorization from The Open Group. #ifndef MILINE_H #include "screenint.h" +#include "privates.h" /* * Public definitions used for configuring basic pixelization aspects @@ -109,7 +110,7 @@ extern void miSetZeroLineBias( } #define SWAPINT(i, j) \ -{ register int _t = i; i = j; j = _t; } +{ int _t = i; i = j; j = _t; } #define SWAPPT(i, j) \ { DDXPointRec _t; _t = i; i = j; j = _t; } @@ -119,9 +120,8 @@ extern void miSetZeroLineBias( t = y1; y1 = y2; y2 = t;\ } -#define miGetZeroLineBias(_pScreen) \ - ((miZeroLineScreenIndex < 0) ? \ - 0 : ((_pScreen)->devPrivates[miZeroLineScreenIndex].uval)) +#define miGetZeroLineBias(_pScreen) ((unsigned long) \ + dixLookupPrivate(&(_pScreen)->devPrivates, miZeroLineScreenKey)) #define CalcLineDeltas(_x1,_y1,_x2,_y2,_adx,_ady,_sx,_sy,_SX,_SY,_octant) \ (_octant) = 0; \ @@ -148,7 +148,7 @@ extern void miSetZeroLineBias( #define IsXDecreasingOctant(_octant) ((_octant) & XDECREASING) #define IsYDecreasingOctant(_octant) ((_octant) & YDECREASING) -extern int miZeroLineScreenIndex; +extern DevPrivateKey miZeroLineScreenKey; extern int miZeroClipLine( int /*xmin*/, |