diff options
| -rw-r--r-- | hw/xfree86/xaa/xaaWideLine.c | 4 | ||||
| -rw-r--r-- | mi/miarc.c | 4 | ||||
| -rw-r--r-- | mi/mifpoly.h | 13 | ||||
| -rw-r--r-- | mi/mifpolycon.c | 4 | ||||
| -rw-r--r-- | mi/miwideline.c | 4 |
5 files changed, 3 insertions, 26 deletions
diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index 9479b0d7a..a684d6676 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -32,10 +32,6 @@ Original mi code written by Keith Packard. #include "xaa.h" #include "xaalocal.h" -#ifdef ICEILTEMPDECL -ICEILTEMPDECL -#endif - #define DRAW_POINT(pScrn, x, y) \ if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, 1); \ else XAAPointHelper(pScrn, x, y) diff --git a/mi/miarc.c b/mi/miarc.c index 2bbbb0e7f..17b7891bf 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -77,10 +77,6 @@ static double miDasin(double v); static double miDatan2(double dy, double dx); double cbrt(double); -#ifdef ICEILTEMPDECL -ICEILTEMPDECL -#endif - /* * some interesting sematic interpretation of the protocol: * diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 8f0507601..7bd77b356 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -48,6 +48,8 @@ SOFTWARE. #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ +#include <X11/Xfuncproto.h> + #define EPSILON 0.000001 #define ISEQUAL(a,b) (Fabs((a) - (b)) <= EPSILON) #define UNEQUAL(a,b) (Fabs((a) - (b)) > EPSILON) @@ -66,20 +68,11 @@ SOFTWARE. #define SQSECANT 108.856472512142 /* 1/sin^2(11/2) - for 11o miter cutoff */ #define D2SECANT 5.21671526231167 /* 1/2*sin(11/2) - max extension per width */ -#ifdef NOINLINEICEIL -#define ICEIL(x) ((int)ceil(x)) -#else -#ifdef __GNUC__ -static __inline int ICEIL(double x) +static _X_INLINE int ICEIL(double x) { int _cTmp = x; return ((x == _cTmp) || (x < 0.0)) ? _cTmp : _cTmp+1; } -#else -#define ICEIL(x) ((((x) == (_cTmp = (x))) || ((x) < 0.0)) ? _cTmp : _cTmp+1) -#define ICEILTEMPDECL static int _cTmp; -#endif -#endif /* Point with sub-pixel positioning. In this case we use doubles, but * see mifpolycon.c for other suggestions diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index 7bc1bb278..f85197157 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -58,10 +58,6 @@ SOFTWARE. static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, int *by, int *ty); -#ifdef ICEILTEMPDECL -ICEILTEMPDECL -#endif - /* * Written by Todd Newman; April. 1987. * diff --git a/mi/miwideline.c b/mi/miwideline.c index 08e4aa33e..8c6022f6f 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -52,10 +52,6 @@ from The Open Group. #include "miwideline.h" #include "mi.h" -#ifdef ICEILTEMPDECL -ICEILTEMPDECL -#endif - static void miLineArc(DrawablePtr pDraw, GCPtr pGC, unsigned long pixel, SpanDataPtr spanData, LineFacePtr leftFace, |