summaryrefslogtreecommitdiff
path: root/hw/xfree86/xaa
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/xaa')
-rw-r--r--hw/xfree86/xaa/xaaBitBlt.c1
-rw-r--r--hw/xfree86/xaa/xaaBitmap.c2
-rw-r--r--hw/xfree86/xaa/xaaCpyArea.c1
-rw-r--r--hw/xfree86/xaa/xaaCpyPlane.c3
-rw-r--r--hw/xfree86/xaa/xaaCpyWin.c1
-rw-r--r--hw/xfree86/xaa/xaaDashLine.c3
-rw-r--r--hw/xfree86/xaa/xaaFallback.c1
-rw-r--r--hw/xfree86/xaa/xaaFillArc.c5
-rw-r--r--hw/xfree86/xaa/xaaFillPoly.c1
-rw-r--r--hw/xfree86/xaa/xaaFillRect.c1
-rw-r--r--hw/xfree86/xaa/xaaGC.c3
-rw-r--r--hw/xfree86/xaa/xaaGCmisc.c1
-rw-r--r--hw/xfree86/xaa/xaaImage.c1
-rw-r--r--hw/xfree86/xaa/xaaInit.c1
-rw-r--r--hw/xfree86/xaa/xaaInitAccel.c3
-rw-r--r--hw/xfree86/xaa/xaaLine.c3
-rw-r--r--hw/xfree86/xaa/xaaLineMisc.c1
-rw-r--r--hw/xfree86/xaa/xaaNonTEGlyph.c1
-rw-r--r--hw/xfree86/xaa/xaaNonTEText.c3
-rw-r--r--hw/xfree86/xaa/xaaOffscreen.c1
-rw-r--r--hw/xfree86/xaa/xaaOverlay.c3
-rw-r--r--hw/xfree86/xaa/xaaOverlayDF.c1
-rw-r--r--hw/xfree86/xaa/xaaPCache.c3
-rw-r--r--hw/xfree86/xaa/xaaPaintWin.c3
-rw-r--r--hw/xfree86/xaa/xaaPict.c3
-rw-r--r--hw/xfree86/xaa/xaaROP.c1
-rw-r--r--hw/xfree86/xaa/xaaRect.c1
-rw-r--r--hw/xfree86/xaa/xaaSpans.c1
-rw-r--r--hw/xfree86/xaa/xaaStateChange.c1
-rw-r--r--hw/xfree86/xaa/xaaStipple.c1
-rw-r--r--hw/xfree86/xaa/xaaTEGlyph.c2
-rw-r--r--hw/xfree86/xaa/xaaTEText.c1
-rw-r--r--hw/xfree86/xaa/xaaWideLine.c12
33 files changed, 22 insertions, 48 deletions
diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c
index de0244848..3639ec787 100644
--- a/hw/xfree86/xaa/xaaBitBlt.c
+++ b/hw/xfree86/xaa/xaaBitBlt.c
@@ -13,7 +13,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c
index b3f00d696..940525927 100644
--- a/hw/xfree86/xaa/xaaBitmap.c
+++ b/hw/xfree86/xaa/xaaBitmap.c
@@ -9,8 +9,6 @@
#include "xaalocal.h"
#include "xaacexp.h"
#include "xf86.h"
-#include "xf86_ansic.h"
-
/********** byte swapping ***************/
diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c
index 8d5bbf9aa..2fe3ab1c3 100644
--- a/hw/xfree86/xaa/xaaCpyArea.c
+++ b/hw/xfree86/xaa/xaaCpyArea.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c
index b60ba3f83..95a22adf5 100644
--- a/hw/xfree86/xaa/xaaCpyPlane.c
+++ b/hw/xfree86/xaa/xaaCpyPlane.c
@@ -14,9 +14,10 @@
#include <xorg-config.h>
#endif
+#include <string.h>
+
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include "servermd.h"
diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c
index e50e88f91..198f8e95c 100644
--- a/hw/xfree86/xaa/xaaCpyWin.c
+++ b/hw/xfree86/xaa/xaaCpyWin.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c
index 059804c70..22645ea1b 100644
--- a/hw/xfree86/xaa/xaaDashLine.c
+++ b/hw/xfree86/xaa/xaaDashLine.c
@@ -4,10 +4,11 @@
#include <xorg-config.h>
#endif
+#include <stdlib.h>
+
#include <X11/X.h>
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include "scrnintstr.h"
diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
index 2f8851c38..da7a38ea9 100644
--- a/hw/xfree86/xaa/xaaFallback.c
+++ b/hw/xfree86/xaa/xaaFallback.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c
index 4c4f0d38d..6d4a5dccf 100644
--- a/hw/xfree86/xaa/xaaFillArc.c
+++ b/hw/xfree86/xaa/xaaFillArc.c
@@ -38,9 +38,10 @@
#include <xorg-config.h>
#endif
+#include <sys/limits.h>
+
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
@@ -201,7 +202,7 @@ XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs)
box.x2 = x2;
y2 = box.y1 + (int)arc->height + 1;
box.y2 = y2;
- if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) &&
+ if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) &&
(RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) )
{
if ((arc->angle2 >= FULLCIRCLE) ||
diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c
index 55177d319..26a2646e7 100644
--- a/hw/xfree86/xaa/xaaFillPoly.c
+++ b/hw/xfree86/xaa/xaaFillPoly.c
@@ -37,7 +37,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c
index bf6328272..1bd7bd14d 100644
--- a/hw/xfree86/xaa/xaaFillRect.c
+++ b/hw/xfree86/xaa/xaaFillRect.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index 83df2a0e2..31f084e7e 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -4,9 +4,10 @@
#include <xorg-config.h>
#endif
+#include <string.h>
+
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c
index 5c04e2266..5a6a0abce 100644
--- a/hw/xfree86/xaa/xaaGCmisc.c
+++ b/hw/xfree86/xaa/xaaGCmisc.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c
index b87cc4eec..a0d7bfb7a 100644
--- a/hw/xfree86/xaa/xaaImage.c
+++ b/hw/xfree86/xaa/xaaImage.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include "servermd.h"
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index 15132560d..f29a2eb3a 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 8f4043537..861410b6d 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -4,9 +4,10 @@
#include <xorg-config.h>
#endif
+#include <string.h>
+
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c
index 2314869cf..c6b78307a 100644
--- a/hw/xfree86/xaa/xaaLine.c
+++ b/hw/xfree86/xaa/xaaLine.c
@@ -4,10 +4,11 @@
#include <xorg-config.h>
#endif
+#include <stdlib.h>
+
#include <X11/X.h>
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include "scrnintstr.h"
diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c
index 7f39229f8..7bb312971 100644
--- a/hw/xfree86/xaa/xaaLineMisc.c
+++ b/hw/xfree86/xaa/xaaLineMisc.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c
index 75318e51c..881707396 100644
--- a/hw/xfree86/xaa/xaaNonTEGlyph.c
+++ b/hw/xfree86/xaa/xaaNonTEGlyph.c
@@ -9,7 +9,6 @@
#include "xaalocal.h"
#include "xaacexp.h"
#include "xf86.h"
-#include "xf86_ansic.h"
/* Not used anymore because the algorithm isn't correct. It doesn't
handle overlapping characters properly */
diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c
index 0d0d8cf11..8c62af477 100644
--- a/hw/xfree86/xaa/xaaNonTEText.c
+++ b/hw/xfree86/xaa/xaaNonTEText.c
@@ -22,9 +22,10 @@
#include <xorg-config.h>
#endif
+#include <string.h>
+
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c
index d227579a9..d1c737c06 100644
--- a/hw/xfree86/xaa/xaaOffscreen.c
+++ b/hw/xfree86/xaa/xaaOffscreen.c
@@ -13,7 +13,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c
index 12d2a959b..53a0827e2 100644
--- a/hw/xfree86/xaa/xaaOverlay.c
+++ b/hw/xfree86/xaa/xaaOverlay.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaOverlay.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */
#ifdef HAVE_XORG_CONFIG_H
@@ -7,7 +7,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
index 0cfd46f50..883e94e6e 100644
--- a/hw/xfree86/xaa/xaaOverlayDF.c
+++ b/hw/xfree86/xaa/xaaOverlayDF.c
@@ -12,7 +12,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c
index a4fadb9aa..b8dd77465 100644
--- a/hw/xfree86/xaa/xaaPCache.c
+++ b/hw/xfree86/xaa/xaaPCache.c
@@ -4,9 +4,10 @@
#include <xorg-config.h>
#endif
+#include <string.h>
+
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c
index 041ee1831..4a82b49c5 100644
--- a/hw/xfree86/xaa/xaaPaintWin.c
+++ b/hw/xfree86/xaa/xaaPaintWin.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaPaintWin.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */
#ifdef HAVE_XORG_CONFIG_H
@@ -7,7 +7,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
index 60cfe0843..847ccb2e0 100644
--- a/hw/xfree86/xaa/xaaPict.c
+++ b/hw/xfree86/xaa/xaaPict.c
@@ -26,9 +26,10 @@
#include <xorg-config.h>
#endif
+#include <string.h>
+
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c
index 80e700153..f6aacb85e 100644
--- a/hw/xfree86/xaa/xaaROP.c
+++ b/hw/xfree86/xaa/xaaROP.c
@@ -7,7 +7,6 @@
#include <X11/X.h>
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include "scrnintstr.h"
diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c
index b176e51fd..1c56d80dc 100644
--- a/hw/xfree86/xaa/xaaRect.c
+++ b/hw/xfree86/xaa/xaaRect.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c
index 315024ef3..150991d7b 100644
--- a/hw/xfree86/xaa/xaaSpans.c
+++ b/hw/xfree86/xaa/xaaSpans.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c
index c0dd6da3e..86c12cc7e 100644
--- a/hw/xfree86/xaa/xaaStateChange.c
+++ b/hw/xfree86/xaa/xaaStateChange.c
@@ -6,7 +6,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c
index 02a2b32ce..7ea9a2dc2 100644
--- a/hw/xfree86/xaa/xaaStipple.c
+++ b/hw/xfree86/xaa/xaaStipple.c
@@ -8,7 +8,6 @@
#include "xaalocal.h"
#include "xaacexp.h"
#include "xf86.h"
-#include "xf86_ansic.h"
static CARD32* StipplePowerOfTwo(CARD32*, CARD32*, int, int, int);
static CARD32* StipplePowerOfTwo_Inverted(CARD32*, CARD32*, int, int, int);
diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c
index 187a9dc61..f755ed9a9 100644
--- a/hw/xfree86/xaa/xaaTEGlyph.c
+++ b/hw/xfree86/xaa/xaaTEGlyph.c
@@ -9,8 +9,6 @@
#include "xaalocal.h"
#include "xaacexp.h"
#include "xf86.h"
-#include "xf86_ansic.h"
-
/* scanline function for TRIPLE_BITS_24BPP */
static CARD32 *DrawTextScanline3(CARD32 *base, CARD32 *mem, int width);
diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c
index 2c1e257cd..72e1858f6 100644
--- a/hw/xfree86/xaa/xaaTEText.c
+++ b/hw/xfree86/xaa/xaaTEText.c
@@ -24,7 +24,6 @@
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>
diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c
index 481ff8cc3..fbec29e7d 100644
--- a/hw/xfree86/xaa/xaaWideLine.c
+++ b/hw/xfree86/xaa/xaaWideLine.c
@@ -1,5 +1,5 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.4 2005/04/20 12:25:40 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaWideLine.c,v 1.7 2005/07/03 08:53:49 daniels Exp $ */
/*
XAAPolylinesWideSolid does not maintain a span list and subsequently does
@@ -18,20 +18,10 @@ Original mi code written by Keith Packard.
#include <xorg-config.h>
#endif
-#ifndef XFree86LOADER
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
- || (defined(sun) && defined(__SVR4))
#include <math.h>
-#else
-#define _XOPEN_SOURCE /* to get prototype for hypot on some systems */
-#include <math.h>
-#undef _XOPEN_SOURCE
-#endif
-#endif
#include "misc.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include <X11/X.h>