From 292c4cff26687e6ef86c285b97813ab587daf009 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 20 Apr 2005 12:25:48 +0000 Subject: Fix includes right throughout the Xserver tree: change "foo.h" to for core headers, e.g. X.h, Xpoll.h; change "foo.h", "extensions/foo.h" and "X11/foo.h" to for extension headers, e.g. Xv.h; change "foo.[ch]" to for Xtrans files. --- mfb/maskbits.h | 4 ++-- mfb/mergerop.h | 2 +- mfb/mfbbitblt.c | 4 ++-- mfb/mfbblt.c | 6 +++--- mfb/mfbbres.c | 2 +- mfb/mfbbresd.c | 2 +- mfb/mfbbstore.c | 2 +- mfb/mfbclip.c | 2 +- mfb/mfbcmap.c | 2 +- mfb/mfbfillarc.c | 4 ++-- mfb/mfbfillrct.c | 4 ++-- mfb/mfbfillsp.c | 4 ++-- mfb/mfbfont.c | 6 +++--- mfb/mfbgc.c | 6 +++--- mfb/mfbgetsp.c | 4 ++-- mfb/mfbhrzvert.c | 2 +- mfb/mfbimage.c | 4 ++-- mfb/mfbimggblt.c | 6 +++--- mfb/mfbline.c | 2 +- mfb/mfbmisc.c | 2 +- mfb/mfbpixmap.c | 2 +- mfb/mfbply1rct.c | 2 +- mfb/mfbplygblt.c | 6 +++--- mfb/mfbpntarea.c | 2 +- mfb/mfbpntwin.c | 2 +- mfb/mfbpolypnt.c | 4 ++-- mfb/mfbpushpxl.c | 2 +- mfb/mfbscrinit.c | 6 +++--- mfb/mfbsetsp.c | 4 ++-- mfb/mfbtegblt.c | 6 +++--- mfb/mfbtile.c | 2 +- mfb/mfbwindow.c | 2 +- mfb/mfbzerarc.c | 4 ++-- 33 files changed, 57 insertions(+), 57 deletions(-) (limited to 'mfb') diff --git a/mfb/maskbits.h b/mfb/maskbits.h index 654ab3d0e..fa5ffca4d 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -24,8 +24,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: maskbits.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" diff --git a/mfb/mergerop.h b/mfb/mergerop.h index 6b5548b12..ba699466c 100644 --- a/mfb/mergerop.h +++ b/mfb/mergerop.h @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. #define _MERGEROP_H_ #ifndef GXcopy -#include "X.h" +#include #endif typedef struct _mergeRopBits { diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 6e950e837..0a5b377b7 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbitblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index ca240ba99..6aff98cac 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -32,9 +32,9 @@ Author: Keith Packard */ /* $Xorg: mfbblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index b1fad2192..3723914b6 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include #include "misc.h" #include "mfb.h" #include "maskbits.h" diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index a7ffdc36c..7a924b713 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include #include "misc.h" #include "mfb.h" #include "maskbits.h" diff --git a/mfb/mfbbstore.c b/mfb/mfbbstore.c index 661ed0827..d30c67ae7 100644 --- a/mfb/mfbbstore.c +++ b/mfb/mfbbstore.c @@ -29,7 +29,7 @@ from The Open Group. */ #include "mfb.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 7c9be7f97..32e1da934 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include #include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index 253399df4..15c73245f 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbcmap.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 9e65d8340..4e1e0623d 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mfbfillarc.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index aa90f411b..13f57e000 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillrct.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index 8fd4c0f29..6c3a2b506 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillsp.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" diff --git a/mfb/mfbfont.c b/mfb/mfbfont.c index f77e70a26..e4ec62cbc 100644 --- a/mfb/mfbfont.c +++ b/mfb/mfbfont.c @@ -45,9 +45,9 @@ SOFTWARE. */ /* $Xorg: mfbfont.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index c7dccf93d..3b0ebedb0 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -46,9 +46,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" #include "dixfontstr.h" #include "fontstruct.h" diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index b63a184f8..1d67bc55e 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "region.h" diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index 626ef67fb..a8f25f127 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbhrzvert.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "gc.h" #include "window.h" diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index 1fb40db5a..b305a2cd4 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" @@ -56,7 +56,7 @@ SOFTWARE. #include "mfb.h" #include "mi.h" -#include "Xmd.h" +#include #include "maskbits.h" diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index aa948a34e..0a4bb6df1 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimggblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbline.c b/mfb/mfbline.c index b8e1d3648..c30deedc7 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbline.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbmisc.c b/mfb/mfbmisc.c index c3e0d3d71..0a4e7f773 100644 --- a/mfb/mfbmisc.c +++ b/mfb/mfbmisc.c @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "misc.h" #include "cursor.h" #include "scrnintstr.h" diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index b6ff40292..ebf086ad8 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -52,7 +52,7 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "maskbits.h" diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index f3f8decc7..6c2af609a 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index 5e4a619be..e8bb8cbce 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbplygblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbpntarea.c b/mfb/mfbpntarea.c index 6b45d3f48..c9aac2c36 100644 --- a/mfb/mfbpntarea.c +++ b/mfb/mfbpntarea.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpntarea.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" diff --git a/mfb/mfbpntwin.c b/mfb/mfbpntwin.c index 97db3bf79..e6dcdfdca 100644 --- a/mfb/mfbpntwin.c +++ b/mfb/mfbpntwin.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index 5c99d03de..e9cbbe36f 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -48,8 +48,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpolypnt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index b268c559f..511d6c22c 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpushpxl.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index 7e840303c..923db41e1 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbscrinit.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xproto.h" /* for xColorItem */ -#include "Xmd.h" +#include +#include /* for xColorItem */ +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index 66da37d1d..0a97507e0 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -48,8 +48,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbsetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "regionstr.h" diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index b0e02850c..455e44c1b 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -49,9 +49,9 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index 50b261114..25a820b9a 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbtile.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index 294083f78..1f277e4b4 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "mfb.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index ad46732ab..54d61bad1 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.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 +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" -- cgit v1.2.3