debrix/hw/xorg/xaa xaa.h, 1.2, 1.3 xaaBitBlt.c, 1.2, 1.3 xaaBitOrder.c, 1.2, 1.3 xaaBitmap.c, 1.2, 1.3 xaaCpyArea.c, 1.2, 1.3 xaaCpyPlane.c, 1.2, 1.3 xaaCpyWin.c, 1.2, 1.3 xaaDashLine.c, 1.2, 1.3 xaaFallback.c, 1.2, 1.3 xaaFillArc.c, 1.2, 1.3 xaaFillPoly.c, 1.2, 1.3 xaaFillRect.c, 1.2, 1.3 xaaGC.c, 1.2, 1.3 xaaGCmisc.c, 1.2, 1.3 xaaImage.c, 1.2, 1.3 xaaInit.c, 1.2, 1.3 xaaInitAccel.c, 1.2, 1.3 xaaLine.c, 1.2, 1.3 xaaLineMisc.c, 1.2, 1.3 xaaNonTEGlyph.c, 1.2, 1.3 xaaNonTEText.c, 1.2, 1.3 xaaOffscreen.c, 1.2, 1.3 xaaOverlay.c, 1.2, 1.3 xaaOverlayDF.c, 1.2, 1.3 xaaPCache.c, 1.2, 1.3 xaaPaintWin.c, 1.2, 1.3 xaaPict.c, 1.2, 1.3 xaaROP.c, 1.2, 1.3 xaaRect.c, 1.2, 1.3 xaaSpans.c, 1.2, 1.3 xaaStateChange.c, 1.2, 1.3 xaaStipple.c, 1.2, 1.3 xaaTEGlyph.c, 1.2, 1.3 xaaTEText.c, 1.2, 1.3 xaaWideLine.c, 1.2, 1.3 xaacexp.h, 1.2, 1.3 xaalocal.h, 1.2, 1.3 xaarop.h, 1.2, 1.3 xaawrap.h, 1.2, 1.3

Daniel Stone xserver-commit at pdx.freedesktop.org
Fri Jun 11 05:41:37 EST 2004 

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg/xaa
In directory pdx:/home/daniel/x/debrix/debrix/hw/xorg/xaa

Modified Files:
	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 xaaTEText.c xaaWideLine.c xaacexp.h xaalocal.h 
	xaarop.h xaawrap.h 
Log Message:
Initial import from modular sources.


Index: xaa.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaa.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaa.h	23 Apr 2004 19:54:16 -0000	1.2
+++ xaa.h	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XAA_H
 #define _XAA_H
 

Index: xaaBitBlt.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaBitBlt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaBitBlt.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaBitBlt.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -7,12 +7,15 @@
    to the fg and bg so CopyPlane can use this. 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #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/debrix/hw/xorg/xaa/xaaBitOrder.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaBitOrder.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaBitOrder.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */
 
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xmd.h>
 CARD32 XAAReverseBitOrder(CARD32 v);
 
 CARD32

Index: xaaBitmap.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaBitmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaBitmap.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaBitmap.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xaa.h"
 #include "xaalocal.h"
 #include "xaacexp.h"

Index: xaaCpyArea.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaCpyArea.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaCpyArea.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaCpyArea.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaCpyPlane.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaCpyPlane.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaCpyPlane.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -10,13 +10,16 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #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/debrix/hw/xorg/xaa/xaaCpyWin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaCpyWin.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaCpyWin.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaDashLine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaDashLine.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaDashLine.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: xaaFallback.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaFallback.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaFallback.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaFallback.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaFillArc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaFillArc.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaFillArc.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -34,12 +34,15 @@
  *
  * Clipped arcs are dispatched to FillSpans.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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: xaaFillPoly.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaFillPoly.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaFillPoly.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaFillPoly.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -31,12 +31,15 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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: xaaFillRect.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaFillRect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaFillRect.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaFillRect.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaGC.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaGC.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaGC.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaGCmisc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaGCmisc.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaGCmisc.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaImage.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaImage.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaImage.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,12 +1,15 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #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/debrix/hw/xorg/xaa/xaaInit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaInit.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaInit.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaInitAccel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaInitAccel.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaInitAccel.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaLine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaLine.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaLine.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: xaaLineMisc.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaLineMisc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaLineMisc.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaLineMisc.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaNonTEGlyph.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaNonTEGlyph.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaNonTEGlyph.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xaa.h"
 #include "xaalocal.h"
 #include "xaacexp.h"

Index: xaaNonTEText.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaNonTEText.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaNonTEText.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaNonTEText.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -18,12 +18,15 @@
 
 ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #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/debrix/hw/xorg/xaa/xaaOffscreen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaOffscreen.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaOffscreen.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -7,12 +7,15 @@
 
 */ 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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: xaaOverlay.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaOverlay.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaOverlay.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaOverlay.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,12 +1,15 @@
 /* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaOverlayDF.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaOverlayDF.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaOverlayDF.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -6,12 +6,15 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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: xaaPCache.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaPCache.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaPCache.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaPCache.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaPaintWin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaPaintWin.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaPaintWin.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,12 +1,15 @@
 /* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaPict.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaPict.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaPict.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -22,12 +22,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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: xaaROP.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaROP.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaROP.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaROP.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86$ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"

Index: xaaRect.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaRect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaRect.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaRect.c	10 Jun 2004 19:41:32 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaSpans.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaSpans.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaSpans.c	10 Jun 2004 19:41:33 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaStateChange.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaStateChange.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaStateChange.c	10 Jun 2004 19:41:33 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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/debrix/hw/xorg/xaa/xaaStipple.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaStipple.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaStipple.c	10 Jun 2004 19:41:33 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xaa.h"
 #include "xaalocal.h"
 #include "xaacexp.h"

Index: xaaTEGlyph.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaTEGlyph.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaTEGlyph.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaTEGlyph.c	10 Jun 2004 19:41:33 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xaa.h"
 #include "xaalocal.h"
 #include "xaacexp.h"

Index: xaaTEText.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaTEText.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaTEText.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaTEText.c	10 Jun 2004 19:41:33 -0000	1.3
@@ -18,12 +18,15 @@
 
 ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #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: xaaWideLine.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaaWideLine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaaWideLine.c	23 Apr 2004 19:54:16 -0000	1.2
+++ xaaWideLine.c	10 Jun 2004 19:41:33 -0000	1.3
@@ -14,6 +14,9 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef XFree86LOADER
 #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__)
 #include <math.h>
@@ -29,7 +32,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/debrix/hw/xorg/xaa/xaacexp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaacexp.h	23 Apr 2004 19:54:16 -0000	1.2
+++ xaacexp.h	10 Jun 2004 19:41:33 -0000	1.3
@@ -1,7 +1,10 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */
 
 
-#include "Xarch.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xarch.h>
 
 #ifndef FIXEDBASE
 #define CHECKRETURN(b) if(width <= ((b) * 32)) return(base + (b))

Index: xaalocal.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaalocal.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaalocal.h	23 Apr 2004 19:54:16 -0000	1.2
+++ xaalocal.h	10 Jun 2004 19:41:33 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XAALOCAL_H
 #define _XAALOCAL_H
 

Index: xaarop.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaarop.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaarop.h	23 Apr 2004 19:54:16 -0000	1.2
+++ xaarop.h	10 Jun 2004 19:41:33 -0000	1.3
@@ -29,6 +29,9 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XAAROP_H
 #define _XAAROP_H
 

Index: xaawrap.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/xaa/xaawrap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xaawrap.h	23 Apr 2004 19:54:16 -0000	1.2
+++ xaawrap.h	10 Jun 2004 19:41:33 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.3 1998/10/25 07:12:14 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define XAA_SCREEN_PROLOGUE(pScreen, field)\
   ((pScreen)->field = \
    ((XAAScreenPtr) (pScreen)->devPrivates[XAAScreenIndex].ptr)->field)

More information about the xserver-commit mailing list