diff options
Diffstat (limited to 'cfb')
40 files changed, 77 insertions, 77 deletions
@@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) -#include "X.h" +#include <X11/X.h> #include "globals.h" #include "pixmap.h" #include "region.h" diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c index 3309fb764..4d10cb0ce 100644 --- a/cfb/cfb8bit.c +++ b/cfb/cfb8bit.c @@ -37,9 +37,9 @@ from The Open Group. #if PSZ == 8 -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 6f8f896b8..74e10cc03 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c index 8da0c1c7b..4739589d8 100644 --- a/cfb/cfballpriv.c +++ b/cfb/cfballpriv.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index b822de61e..0a68c0712 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -33,9 +33,9 @@ Author: Keith Packard */ /* $Xorg: cfbbitblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index 7f4e3e10f..06e271640 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -34,9 +34,9 @@ Author: Keith Packard /* 24-bit bug fixes: Peter Wainwright, 1998/11/28 */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c index b306ee80b..85cd906fa 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "cfb.h" #include "cfbmskbits.h" diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index 4f6630ab3..fd4144f40 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "cfb.h" #include "cfbmskbits.h" diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c index 19de06ad9..1ca165524 100644 --- a/cfb/cfbbstore.c +++ b/cfb/cfbbstore.c @@ -18,7 +18,7 @@ /* $Xorg: cfbbstore.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ #include "cfb.h" -#include "X.h" +#include <X11/X.h> #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index 1806916ff..7d7f39a0e 100644 --- a/cfb/cfbcmap.c +++ b/cfb/cfbcmap.c @@ -30,8 +30,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index 54360e95c..b2b53999b 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 01e4557d4..837067ff9 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbfillarc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c index 86258ed4f..4ea3177d1 100644 --- a/cfb/cfbfillrct.c +++ b/cfb/cfbfillrct.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbfillrct.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index 6234694d6..d460fad1d 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -77,8 +77,8 @@ SOFTWARE. /* $Xorg: cfbfillsp.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index af739daa4..bd9efd20c 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -48,9 +48,9 @@ SOFTWARE. /* $Xorg: cfbgc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "cfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index 003be6dcc..f00e051a1 100644 --- a/cfb/cfbgetsp.c +++ b/cfb/cfbgetsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "misc.h" diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c index b850723df..290970a50 100644 --- a/cfb/cfbglblt8.c +++ b/cfb/cfbglblt8.c @@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group. * only. */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "cfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c index 88b1e740f..408f60533 100644 --- a/cfb/cfbhrzvert.c +++ b/cfb/cfbhrzvert.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbhrzvert.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gc.h" #include "window.h" diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c index a40e995be..c0ea250f6 100644 --- a/cfb/cfbigblt8.c +++ b/cfb/cfbigblt8.c @@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mi.h" #include "cfb.h" #include "fontstruct.h" diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index 68b5cc68d..17166a396 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbimage.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 28b0cb8c5..8fec8fbd0 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbline.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c index 5bc759d01..cc21efc35 100644 --- a/cfb/cfbmskbits.c +++ b/cfb/cfbmskbits.c @@ -48,8 +48,8 @@ bit index 32-n in a longword see also cfbmskbits.h */ -#include <X.h> -#include <Xmd.h> +#include <X11/X.h> +#include <X11/Xmd.h> #include <servermd.h> #include "cfb.h" #include "cfbmskbits.h" diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index 5d5764c09..a803cac72 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -31,8 +31,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $Xorg: cfbmskbits.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ /* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #if defined(XFREE86) || ( defined(__OpenBSD__) && defined(__alpha__) ) \ || (defined(__bsdi__)) diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index 53ea34c45..46bd90f6f 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -52,7 +52,7 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index fa38f0cf4..5d2213682 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index 9f6cc78d2..f6050fc26 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.2 2004/04/23 19:00:12 eich Exp $ */ /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c index a5886b6ec..607fc1b3c 100644 --- a/cfb/cfbpolypnt.c +++ b/cfb/cfbpolypnt.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbpolypnt.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c index 3f313b0e3..31643fe2e 100644 --- a/cfb/cfbpush8.c +++ b/cfb/cfbpush8.c @@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open Group. #if PSZ == 8 -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c index ba8dd89f2..e8509b029 100644 --- a/cfb/cfbrctstp8.c +++ b/cfb/cfbrctstp8.c @@ -34,8 +34,8 @@ Author: Keith Packard, MIT X Consortium #if PSZ == 8 -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c index 3014b3a5a..909d03a9b 100644 --- a/cfb/cfbrrop.c +++ b/cfb/cfbrrop.c @@ -29,9 +29,9 @@ in this Software without prior written authorization from The Open Group. /* cfb reduced rasterop computations */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "cfb.h" #include "cfbmskbits.h" diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h index a43bf1978..cfa3a93fa 100644 --- a/cfb/cfbrrop.h +++ b/cfb/cfbrrop.h @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */ #ifndef GXcopy -#include "X.h" +#include <X11/X.h> #endif #define RROP_FETCH_GC(gc) \ diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c index 2bc0befd3..2aae7d5a0 100644 --- a/cfb/cfbscrinit.c +++ b/cfb/cfbscrinit.c @@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $Xorg: cfbscrinit.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index 8385fe35a..c41210380 100644 --- a/cfb/cfbsetsp.c +++ b/cfb/cfbsetsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "misc.h" diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c index f4e7f3385..1fd3acf02 100644 --- a/cfb/cfbsolid.c +++ b/cfb/cfbsolid.c @@ -28,8 +28,8 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c index 3e00393bf..2be72262e 100644 --- a/cfb/cfbteblt8.c +++ b/cfb/cfbteblt8.c @@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group. #if PSZ == 8 -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "cfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c index ff7f3be57..8893479b3 100644 --- a/cfb/cfbtegblt.c +++ b/cfb/cfbtegblt.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "cfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c index 1ba4bb16d..c9f64f15c 100644 --- a/cfb/cfbtile32.c +++ b/cfb/cfbtile32.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbtile32.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c index bd6a0b82c..dd5860894 100644 --- a/cfb/cfbtileodd.c +++ b/cfb/cfbtileodd.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbtileodd.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index 13148728c..2c5eada23 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "cfb.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index baa89f318..358658afc 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" |