diff options
Diffstat (limited to 'hw/xfree86/xaa')
32 files changed, 36 insertions, 36 deletions
diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 5bde21cbe..36e3a3800 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -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" diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index ce19a853e..7772f3387 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ -#include "Xmd.h" +#include <X11/Xmd.h> CARD32 XAAReverseBitOrder(CARD32 v); CARD32 diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 7a036937b..a13060178 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index 9e17a187f..611acc502 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -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" diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index e4439c447..24e8c907f 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index e5eba7819..a9660d3ec 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index df67342ff..d59dc4dba 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 95ecf257b..a7945b068 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.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" diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 4ba1cd853..fcd8783c8 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -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" diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index 7571ce3ca..89d6756fb 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -5,7 +5,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" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index b7a177521..945c2e6ef 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 3eab6d46a..acd56c344 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index b7ee997e3..9af3aeec1 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -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" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index f6f2d491e..822662e39 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -5,7 +5,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" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 9d3764506..9378bcf6c 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 3149acf5c..b40ad4aea 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 8afd479b7..f63dc9ff7 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "miline.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 914631b58..9e6f61f6f 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -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" diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index b50b31bb0..e99f9c34c 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -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" diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 78c89784e..967bb1993 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.2 2004/04/23 19:54:16 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ #include "misc.h" @@ -6,7 +6,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index eb20ea8dd..dbd2357c2 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -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" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 94790d21c..9d2622e95 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "gc.h" #include "mi.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 9c1cc715f..887fa1acc 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.2 2004/04/23 19:54:16 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ #include "misc.h" @@ -6,7 +6,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index 628a0420a..b9ca27cd8 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -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" diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 931740159..29b6d764a 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 999d7177d..d39ca834b 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -5,7 +5,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" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 356774c29..3facb7af8 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -5,7 +5,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" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index 2d0738242..ca7c3fb7b 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -5,7 +5,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" diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 49089afb3..432cef4b2 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -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" diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index d80a78be5..29faa1ab0 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: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.3 2004/08/29 00:48:17 alanc Exp $ */ /* XAAPolylinesWideSolid does not maintain a span list and subsequently does @@ -30,7 +30,7 @@ Original mi code written by Keith Packard. #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "gcstruct.h" #include "regionstr.h" diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c index 9c5befcd2..7ec3dcf7f 100644 --- a/hw/xfree86/xaa/xaaWrapper.c +++ b/hw/xfree86/xaa/xaaWrapper.c @@ -1,5 +1,5 @@ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "gcstruct.h" #include "glyphstr.h" diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 933d8f733..2f75b7e32 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ -#include "Xarch.h" +#include <X11/Xarch.h> #ifndef FIXEDBASE #define CHECKRETURN(b) if(width <= ((b) * 32)) return(base + (b)) |