[xserver-commit] xfree86/xaa XAA.HOWTO,1.13,1.14 xaa.h,1.39,1.40 xaaBitBlt.c,1.4,1.5 xaaBitOrder.c,1.8,1.9 xaaBitmap.c,1.10,1.11 xaaCpyArea.c,1.13,1.14 xaaCpyPlane.c,1.14,1.15 xaaCpyWin.c,1.4,1.5 xaaDashLine.c,1.5,1.6 xaaFallback.c,1.5,1.6 xaaFillArc.c,1.4,1.5 xaaFillPoly.c,1.16,1.17 xaaFillRect.c,1.16,1.17 xaaGC.c,1.19,1.20 xaaGCmisc.c,1.15,1.16 xaaImage.c,1.21,1.22 xaaInit.c,1.35,1.36 xaaInitAccel.c,1.36,1.37 xaaLine.c,1.6,1.7 xaaLineMisc.c,1.5,1.6 xaaNonTEGlyph.c,1.6,1.7 xaaNonTEText.c,1.14,1.15 xaaOffscreen.c,1.6,1.7 xaaOverlay.c,1.15,1.16 xaaOverlayDF.c,1.2,1.3 xaaPCache.c,1.33,1.34 xaaPaintWin.c,1.11,1.12 xaaPict.c,1.19,1.20 xaaROP.c,1.2,1.3 xaaRect.c,1.3,1.4 xaaSpans.c,1.15,1.16 xaaStateChange.c,3.3,3.4 xaaStipple.c,1.12,1.13 xaaTEGlyph.c,1.9,1.10 xaaTEGlyphBlt.S,1.2,1.3 xaaTEText.c,1.7,1.8 xaaTables.c,1.2,1.3 xaaWideLine.c,1.11,1.12 xaacexp.h,1.5,1.6 xaalocal.h,1.37,1.38 xaarop.h,1.1,1.2 xaawrap.h,1.5,1.6

Daniel Stone xserver-commit@pdx.freedesktop.org


Committed by: daniel

Update of /cvs/xserver/xfree86/xaa
In directory pdx:/home/daniel/src/xserver/hw/xfree86/xaa

Modified Files:
	XAA.HOWTO xaa.h xaaBitBlt.c xaaBitOrder.c xaaBitmap.c 
	xaaCpyArea.c xaaCpyPlane.c xaaCpyWin.c xaaDashLine.c 
	xaaFallback.c xaaFillArc.c xaaFillPoly.c xaaFillRect.c xaaGC.c 
	xaaGCmisc.c xaaImage.c xaaInit.c xaaInitAccel.c xaaLine.c 
	xaaLineMisc.c xaaNonTEGlyph.c xaaNonTEText.c xaaOffscreen.c 
	xaaOverlay.c xaaOverlayDF.c xaaPCache.c xaaPaintWin.c 
	xaaPict.c xaaROP.c xaaRect.c xaaSpans.c xaaStateChange.c 
	xaaStipple.c xaaTEGlyph.c xaaTEGlyphBlt.S xaaTEText.c 
	xaaTables.c xaaWideLine.c xaacexp.h xaalocal.h xaarop.h 
	xaawrap.h 
Log Message:
Checkin stage #4: everything else we've changed.

Index: XAA.HOWTO
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/XAA.HOWTO,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/XAA.HOWTO	22 May 2001 18:51:09 -0000	1.13
+++ b/XAA.HOWTO	19 Feb 2004 03:51:45 -0000	1.14
@@ -1424,4 +1424,4 @@
      pixmap with a particular dimension is allowed, then your driver will be
      expected to render primitives as large as that pixmap.  
 
-$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.12 2000/04/12 14:44:42 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.13 2001/05/22 18:51:09 mvojkovi Exp $

Index: xaa.h
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaa.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- a/xaa.h	30 Oct 2002 12:52:43 -0000	1.39
+++ b/xaa.h	19 Feb 2004 03:51:45 -0000	1.40
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.39 2002/10/30 12:52:43 alanh Exp $ */
 
 #ifndef _XAA_H
 #define _XAA_H

Index: xaaBitBlt.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaBitBlt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/xaaBitBlt.c	10 Nov 2003 18:22:39 -0000	1.4
+++ b/xaaBitBlt.c	19 Feb 2004 03:51:45 -0000	1.5
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.3tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.4 2003/11/10 18:22:39 tsi Exp $ */
 
 /* 
    This is a lighter version of cfbBitBlt.  We calculate the boxes
@@ -12,7 +12,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "mi.h"
 #include "pixmapstr.h"
 #include "gcstruct.h"

Index: xaaBitOrder.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaBitOrder.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/xaaBitOrder.c	17 Feb 2003 16:08:29 -0000	1.8
+++ b/xaaBitOrder.c	19 Feb 2004 03:51:45 -0000	1.9
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.8 2003/02/17 16:08:29 dawes Exp $ */
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 CARD32 XAAReverseBitOrder(CARD32 v);
 
 CARD32

Index: xaaBitmap.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaBitmap.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/xaaBitmap.c	1 Sep 2000 05:49:45 -0000	1.10
+++ b/xaaBitmap.c	19 Feb 2004 03:51:46 -0000	1.11
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.10 2000/09/01 05:49:45 mvojkovi Exp $ */
 
 
 #include "xaa.h"

Index: xaaCpyArea.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaCpyArea.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/xaaCpyArea.c	19 Feb 2001 22:19:49 -0000	1.13
+++ b/xaaCpyArea.c	19 Feb 2004 03:51:46 -0000	1.14
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.13 2001/02/19 22:19:49 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "xf86str.h"
 #include "xaa.h"

Index: xaaCpyPlane.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaCpyPlane.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/xaaCpyPlane.c	10 Nov 2003 18:22:40 -0000	1.14
+++ b/xaaCpyPlane.c	19 Feb 2004 03:51:46 -0000	1.15
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.13tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.14 2003/11/10 18:22:40 tsi Exp $ */
 
 /*
    A CopyPlane function that handles bitmap->screen copies and
@@ -16,7 +16,7 @@
 #include "xf86_OSproc.h"
 #include "servermd.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "mi.h"
 #include "pixmapstr.h"

Index: xaaCpyWin.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaCpyWin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/xaaCpyWin.c	10 Nov 2003 18:22:40 -0000	1.4
+++ b/xaaCpyWin.c	19 Feb 2004 03:51:46 -0000	1.5
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.4 2003/11/10 18:22:40 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "xf86str.h"

Index: xaaDashLine.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaDashLine.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xaaDashLine.c	18 Sep 2002 18:14:59 -0000	1.5
+++ b/xaaDashLine.c	19 Feb 2004 03:51:46 -0000	1.6
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.5 2002/09/18 18:14:59 martin Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: xaaFallback.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaFallback.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xaaFallback.c	30 May 1999 03:03:31 -0000	1.5
+++ b/xaaFallback.c	19 Feb 2004 03:51:46 -0000	1.6
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.5 1999/05/30 03:03:31 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "xf86str.h"
 #include "xaa.h"

Index: xaaFillArc.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaFillArc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/xaaFillArc.c	30 May 1999 03:03:31 -0000	1.4
+++ b/xaaFillArc.c	19 Feb 2004 03:51:46 -0000	1.5
@@ -21,7 +21,7 @@
  * 
  * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.3 1998/10/25 07:12:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.4 1999/05/30 03:03:31 dawes Exp $ */
  
 /*
  * Filled solid arcs, based on cfbfillarc.c.
@@ -39,7 +39,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "xf86str.h"

Index: xaaFillPoly.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaFillPoly.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/xaaFillPoly.c	23 Mar 2003 03:41:44 -0000	1.16
+++ b/xaaFillPoly.c	19 Feb 2004 03:51:46 -0000	1.17
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.16 2003/03/23 03:41:44 mvojkovi Exp $ */
 
 /*
  * Copyright 1996  The XFree86 Project
@@ -36,7 +36,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "xf86str.h"

Index: xaaFillRect.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaFillRect.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/xaaFillRect.c	10 Nov 2003 18:22:40 -0000	1.16
+++ b/xaaFillRect.c	19 Feb 2004 03:51:46 -0000	1.17
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.16 2003/11/10 18:22:40 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "xf86str.h"

Index: xaaGC.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaGC.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/xaaGC.c	19 Feb 2001 22:19:50 -0000	1.19
+++ b/xaaGC.c	19 Feb 2004 03:51:46 -0000	1.20
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.19 2001/02/19 22:19:50 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "xf86str.h"
 #include "xaa.h"

Index: xaaGCmisc.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaGCmisc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xaaGCmisc.c	25 Sep 2000 23:56:14 -0000	1.15
+++ b/xaaGCmisc.c	19 Feb 2004 03:51:46 -0000	1.16
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.15 2000/09/25 23:56:14 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"

Index: xaaImage.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaImage.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/xaaImage.c	10 Nov 2003 18:22:41 -0000	1.21
+++ b/xaaImage.c	19 Feb 2004 03:51:46 -0000	1.22
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.21 2003/11/10 18:22:41 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -6,7 +6,7 @@
 #include "xf86_OSproc.h"
 #include "servermd.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "mi.h"
 #include "pixmapstr.h"

Index: xaaInit.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaInit.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- a/xaaInit.c	19 Jul 2001 18:50:16 -0000	1.35
+++ b/xaaInit.c	19 Feb 2004 03:51:46 -0000	1.36
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.35 2001/07/19 18:50:16 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"

Index: xaaInitAccel.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaInitAccel.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- a/xaaInitAccel.c	12 Jan 2003 03:55:51 -0000	1.36
+++ b/xaaInitAccel.c	19 Feb 2004 03:51:46 -0000	1.37
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.36 2003/01/12 03:55:51 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "xf86str.h"
 #include "xaa.h"

Index: xaaLine.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaLine.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/xaaLine.c	18 Sep 2002 18:15:00 -0000	1.6
+++ b/xaaLine.c	19 Feb 2004 03:51:46 -0000	1.7
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.6 2002/09/18 18:15:00 martin Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: xaaLineMisc.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaLineMisc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xaaLineMisc.c	14 Jan 1999 13:05:27 -0000	1.5
+++ b/xaaLineMisc.c	19 Feb 2004 03:51:46 -0000	1.6
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.5 1999/01/14 13:05:27 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "miline.h"
 #include "xf86str.h"

Index: xaaNonTEGlyph.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaNonTEGlyph.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/xaaNonTEGlyph.c	6 Nov 1999 23:14:46 -0000	1.6
+++ b/xaaNonTEGlyph.c	19 Feb 2004 03:51:46 -0000	1.7
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.6 1999/11/06 23:14:46 mvojkovi Exp $ */
 
 
 #include "xaa.h"

Index: xaaNonTEText.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaNonTEText.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/xaaNonTEText.c	14 Nov 2003 21:54:51 -0000	1.14
+++ b/xaaNonTEText.c	19 Feb 2004 03:51:46 -0000	1.15
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.12 2000/04/07 19:11:10 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.14 2003/11/14 21:54:51 dawes Exp $ */
 
 /********************************************************************
 
@@ -23,7 +23,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "font.h"
 #include "scrnintstr.h"
 #include "dixfontstr.h"

Index: xaaOffscreen.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaOffscreen.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/xaaOffscreen.c	19 Jul 2001 18:50:16 -0000	1.6
+++ b/xaaOffscreen.c	19 Feb 2004 03:51:46 -0000	1.7
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.5 1999/07/04 06:39:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.6 2001/07/19 18:50:16 mvojkovi Exp $ */
 
 /*
    Copyright (c) 1999 -  The XFree86 Project Inc.
@@ -12,7 +12,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"

Index: xaaOverlay.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaOverlay.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xaaOverlay.c	10 Nov 2003 18:22:41 -0000	1.15
+++ b/xaaOverlay.c	19 Feb 2004 03:51:46 -0000	1.16
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "xf86str.h"

Index: xaaOverlayDF.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaOverlayDF.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xaaOverlayDF.c	10 Nov 2003 18:22:41 -0000	1.2
+++ b/xaaOverlayDF.c	19 Feb 2004 03:51:46 -0000	1.3
@@ -3,7 +3,7 @@
 
    Written by Mark Vojkovich
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.2 2003/11/10 18:22:41 tsi Exp $ */
 
 
 #include "misc.h"
@@ -11,7 +11,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"

Index: xaaPCache.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaPCache.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- a/xaaPCache.c	3 Nov 2003 05:11:54 -0000	1.33
+++ b/xaaPCache.c	19 Feb 2004 03:51:46 -0000	1.34
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.33 2003/11/03 05:11:54 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "gc.h"
 #include "mi.h"

Index: xaaPaintWin.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaPaintWin.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/xaaPaintWin.c	17 Feb 2003 16:08:29 -0000	1.11
+++ b/xaaPaintWin.c	19 Feb 2004 03:51:46 -0000	1.12
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "xf86str.h"

Index: xaaPict.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaPict.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/xaaPict.c	26 Jan 2004 18:54:55 -0000	1.19
+++ b/xaaPict.c	19 Feb 2004 03:51:46 -0000	1.20
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.18 2003/04/23 18:35:34 eich Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.19 2004/01/26 18:54:55 mvojkovi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -27,7 +27,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"

Index: xaaROP.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaROP.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xaaROP.c	28 Sep 2000 20:48:01 -0000	1.2
+++ b/xaaROP.c	19 Feb 2004 03:51:46 -0000	1.3
@@ -1,6 +1,6 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.2 2000/09/28 20:48:01 mvojkovi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: xaaRect.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaRect.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xaaRect.c	30 May 1999 03:03:33 -0000	1.3
+++ b/xaaRect.c	19 Feb 2004 03:51:46 -0000	1.4
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.3 1999/05/30 03:03:33 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "xf86str.h"

Index: xaaSpans.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaSpans.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xaaSpans.c	28 Oct 2001 03:34:04 -0000	1.15
+++ b/xaaSpans.c	19 Feb 2004 03:51:46 -0000	1.16
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "xf86str.h"

Index: xaaStateChange.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaStateChange.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- a/xaaStateChange.c	22 Aug 2003 19:27:31 -0000	3.3
+++ b/xaaStateChange.c	19 Feb 2004 03:51:46 -0000	3.4
@@ -1,11 +1,11 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.3 2003/08/22 19:27:31 eich Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"

Index: xaaStipple.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaStipple.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/xaaStipple.c	4 Aug 2003 22:18:31 -0000	1.12
+++ b/xaaStipple.c	19 Feb 2004 03:51:46 -0000	1.13
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.12 2003/08/04 22:18:31 mvojkovi Exp $ */
 
 #include "xaa.h"
 #include "xaalocal.h"

Index: xaaTEGlyph.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaTEGlyph.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/xaaTEGlyph.c	1 Sep 2000 05:49:45 -0000	1.9
+++ b/xaaTEGlyph.c	19 Feb 2004 03:51:46 -0000	1.10
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.9 2000/09/01 05:49:45 mvojkovi Exp $ */
 
 
 #include "xaa.h"

Index: xaaTEGlyphBlt.S
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaTEGlyphBlt.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xaaTEGlyphBlt.S	27 Dec 1999 00:39:52 -0000	1.2
+++ b/xaaTEGlyphBlt.S	19 Feb 2004 03:51:46 -0000	1.3
@@ -21,7 +21,7 @@
  * 
  * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.1 1999/07/10 07:24:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.2 1999/12/27 00:39:52 robin Exp $ */
 
 
 /*

Index: xaaTEText.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaTEText.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/xaaTEText.c	30 May 1999 03:03:33 -0000	1.7
+++ b/xaaTEText.c	19 Feb 2004 03:51:46 -0000	1.8
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.6 1998/12/20 11:57:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.7 1999/05/30 03:03:33 dawes Exp $ */
 
 /********************************************************************
 
@@ -23,7 +23,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "font.h"
 #include "scrnintstr.h"
 #include "dixfontstr.h"

Index: xaaTables.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaTables.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xaaTables.c	25 Jul 1998 16:58:53 -0000	1.2
+++ b/xaaTables.c	19 Feb 2004 03:51:46 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.1.2.1 1998/07/12 09:43:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.2 1998/07/25 16:58:53 dawes Exp $ */
 
 /*
  * This is a table of 24-bit values, indexed with an 8-bit byte value, then

Index: xaaWideLine.c
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaaWideLine.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/xaaWideLine.c	16 Jul 2003 01:38:48 -0000	1.11
+++ b/xaaWideLine.c	19 Feb 2004 03:51:46 -0000	1.12
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.11 2003/07/16 01:38:48 dawes Exp $ */
 
 /*
 
@@ -29,7 +29,7 @@
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "regionstr.h"

Index: xaacexp.h
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaacexp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xaacexp.h	13 Jun 2000 02:51:25 -0000	1.5
+++ b/xaacexp.h	19 Feb 2004 03:51:46 -0000	1.6
@@ -1,7 +1,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */
 
 
-#include "Xarch.h"
+#include <X11/Xarch.h>
 
 #ifndef FIXEDBASE
 #define CHECKRETURN(b) if(width <= ((b) * 32)) return(base + (b))

Index: xaalocal.h
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaalocal.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- a/xaalocal.h	10 Nov 2003 18:22:41 -0000	1.37
+++ b/xaalocal.h	19 Feb 2004 03:51:46 -0000	1.38
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.37 2003/11/10 18:22:41 tsi Exp $ */
 
 #ifndef _XAALOCAL_H
 #define _XAALOCAL_H

Index: xaarop.h
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaarop.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/xaarop.h	21 Mar 1999 07:35:31 -0000	1.1
+++ b/xaarop.h	19 Feb 2004 03:51:46 -0000	1.2
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaarop.h,v 1.1 1999/03/21 07:35:31 dawes Exp $ */
 
 /*
 

Index: xaawrap.h
===================================================================
RCS file: /cvs/xserver/xfree86/xaa/xaawrap.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xaawrap.h	20 Sep 2000 02:05:42 -0000	1.5
+++ b/xaawrap.h	19 Feb 2004 03:51:46 -0000	1.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.3 1998/10/25 07:12:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.5 2000/09/20 02:05:42 keithp Exp $ */
 
 #define XAA_SCREEN_PROLOGUE(pScreen, field)\
   ((pScreen)->field = \