diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index efc9bf1d24..8019addeac 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.2 2004/04/23 18:44:40 eich Exp $ */ /* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA @@ -61,7 +61,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include "input.h" /* Server DevicePtr definitions */ -#include "misc.h" /* Server swapping macros */ +#include /* Server swapping macros */ #include "dixstruct.h" /* Server ClientRec definitions */ #include "resource.h" /* Used with the MakeAtom call */ #ifdef PC diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c index cab6d5e110..5f87094807 100644 --- a/XTrap/xtrapdiswp.c +++ b/XTrap/xtrapdiswp.c @@ -52,7 +52,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include "input.h" /* Server DevicePtr definitions */ -#include "misc.h" +#include #include "dixstruct.h" #ifdef PC # include "extnsist.h" diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c index 3c9385794e..1e2a149605 100644 --- a/XTrap/xtrapditbl.c +++ b/XTrap/xtrapditbl.c @@ -42,7 +42,7 @@ SOFTWARE. #include #include #include "input.h" /* Server DevicePtr definitions */ -#include "misc.h" +#include #include "dixstruct.h" #ifdef PC # include "extnsist.h" diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 9d84f92d46..b8fb4420a3 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -30,7 +30,7 @@ from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" diff --git a/Xext/bigreq.c b/Xext/bigreq.c index d71a9afe37..65b25a9099 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -31,8 +31,8 @@ from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include diff --git a/Xext/cup.c b/Xext/cup.c index 2ada50f632..55b2930c11 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/Xext/dpms.c b/Xext/dpms.c index de0ca66507..093410336f 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -37,8 +37,8 @@ Equipment Corporation. #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" diff --git a/Xext/fontcache.c b/Xext/fontcache.c index c45b00ffe5..b49a0d4176 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -35,7 +35,7 @@ #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" diff --git a/Xext/mbuf.c b/Xext/mbuf.c index d8d73aa8e4..be520b0f85 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. #include #include #include "window.h" -#include "os.h" +#include #include "windowstr.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index a9ba78b3aa..10550dc374 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index 11c997b795..1a96d00971 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index c2a27e0f68..e32642b281 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #define _MITMISC_SERVER_ diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 5eb5c1f3c2..f2a8a7cd5d 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -30,7 +30,7 @@ Equipment Corporation. #include #include #include -#include "misc.h" +#include #include "cursor.h" #include "cursorstr.h" #include "extnsionst.h" diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index fb212fd009..c4faa5a9a8 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -1,5 +1,5 @@ /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.2 2004/04/23 18:44:41 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index dcd9fc227f..d86b744cd0 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -28,7 +28,7 @@ Equipment Corporation. #include #include #include -#include "misc.h" +#include #include "cursor.h" #include "cursorstr.h" #include "extnsionst.h" diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 0b95af6af6..5a30608396 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -41,7 +41,7 @@ Equipment Corporation. #include "opaque.h" #include "inputstr.h" #include "migc.h" -#include "misc.h" +#include #include "dixstruct.h" #include "panoramiX.h" #include "panoramiXsrv.h" diff --git a/Xext/saver.c b/Xext/saver.c index 23c40bc372..0597bea9f8 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.6 2005/03/23 21:09:48 herrb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.7 2005/04/20 12:25:12 daniels Exp $ */ /* * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ * @@ -34,8 +34,8 @@ in this Software without prior written authorization from the X Consortium. #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/Xext/security.c b/Xext/security.c index 736598faa6..75ca167651 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* diff --git a/Xext/shape.c b/Xext/shape.c index 50a4034435..bf07eb1809 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.4 2004/07/29 23:43:39 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.6 2005/06/10 04:01:14 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/Xext/shm.c b/Xext/shm.c index 474020eb12..de791c8bd9 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -45,8 +45,8 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "scrnintstr.h" diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 20f3a1f96a..ce925adc58 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. #include "sleepuntil.h" #include #include -#include "misc.h" +#include #include "windowstr.h" #include "dixstruct.h" #include "pixmapstr.h" diff --git a/Xext/sync.c b/Xext/sync.c index 2e4d247f09..110ce206a8 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -57,8 +57,8 @@ PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "extnsionst.h" #include "dixstruct.h" #include "resource.h" diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 9b37807748..dbd9496d71 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -32,8 +32,8 @@ from The Open Group. #define NEED_REPLIES #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" diff --git a/Xext/xevie.c b/Xext/xevie.c index 947e39f3a0..d33f027a9f 100644 --- a/Xext/xevie.c +++ b/Xext/xevie.c @@ -30,13 +30,13 @@ or other dealings in this Software without prior written authorization of the copyright holder. ************************************************************/ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xevie.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 51bac86cec..7614834414 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -62,8 +62,8 @@ #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "gcstruct.h" #include "dixfontstr.h" diff --git a/Xext/xprint.c b/Xext/xprint.c index 14790d6f7a..965374fe11 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -72,7 +72,7 @@ copyright holders. #define NEED_EVENTS #include #undef NEED_EVENTS -#include "misc.h" +#include #include "windowstr.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/Xext/xres.c b/Xext/xres.c index ca6e5bbc3b..7a8fa50b48 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -2,14 +2,14 @@ Copyright (c) 2002 XFree86 Inc */ /* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */ -/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.3 2004/12/15 20:51:25 herrb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.4 2005/04/20 12:25:12 daniels Exp $ */ #define NEED_EVENTS #define NEED_REPLIES #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" diff --git a/Xext/xtest.c b/Xext/xtest.c index 7e81ce53d9..e9876b2b85 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* @@ -32,8 +32,8 @@ from The Open Group. #include #define NEED_EVENTS #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "windowstr.h" diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c index 686ff72dff..1681d6c501 100644 --- a/Xext/xtest1dd.c +++ b/Xext/xtest1dd.c @@ -66,7 +66,7 @@ University of California. #include #include #include -#include "misc.h" +#include #include "dixstruct.h" #define XTestSERVER_SIDE #include diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c index b6fb36ff16..cb8c86aae0 100644 --- a/Xext/xtest1di.c +++ b/Xext/xtest1di.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* * File: xtest1di.c @@ -65,8 +65,8 @@ University of California. #include #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "gcstruct.h" #include "extnsionst.h" #include "dixstruct.h" diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index b96565c683..bf18e45877 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -50,7 +50,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 00406373ef..e6c644407a 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -77,8 +77,8 @@ SOFTWARE. #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "scrnintstr.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/Xext/xvmc.c b/Xext/xvmc.c index e533393df5..05424fe02a 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -4,8 +4,8 @@ #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "scrnintstr.h" diff --git a/Xprint/Init.c b/Xprint/Init.c index 94259dd256..44520507c7 100644 --- a/Xprint/Init.c +++ b/Xprint/Init.c @@ -73,7 +73,7 @@ copyright holders. #include "screenint.h" #include "input.h" #include "cursor.h" -#include "misc.h" +#include #include "windowstr.h" #include "inputstr.h" @@ -90,7 +90,7 @@ typedef char *XPointer; #include "DiPrint.h" #include "attributes.h" -#include "os.h" +#include #include "spooler.h" static void GenericScreenInit( diff --git a/Xprint/Util.c b/Xprint/Util.c index fd8ccd1c3b..595fb6ccfd 100644 --- a/Xprint/Util.c +++ b/Xprint/Util.c @@ -41,7 +41,7 @@ copyright holders. #include #include #include -#include "misc.h" +#include #include "dixstruct.h" #include diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c index ea50004519..8bbd8b381c 100644 --- a/Xprint/mediaSizes.c +++ b/Xprint/mediaSizes.c @@ -58,7 +58,7 @@ copyright holders. #include #include "dixstruct.h" #include "screenint.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "fontstruct.h" diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h index f11cc7a6c0..92621d232f 100644 --- a/Xprint/pcl/Pcl.h +++ b/Xprint/pcl/Pcl.h @@ -73,7 +73,7 @@ typedef char *XPointer; #define Status int #define True 1 #define False 0 -#include "misc.h" +#include #include #include #include "attributes.h" diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h index 2f68304449..8c47fc9e5f 100644 --- a/Xprint/ps/Ps.h +++ b/Xprint/ps/Ps.h @@ -108,7 +108,7 @@ typedef char *XPointer; #define False 0 #endif -#include "misc.h" +#include #include #include #include "attributes.h" diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c index 11d4975710..66764401c9 100644 --- a/Xprint/ps/psout.c +++ b/Xprint/ps/psout.c @@ -76,7 +76,7 @@ in this Software without prior written authorization from The Open Group. #include #include -#include "os.h" +#include #define USE_PSOUT_PRIVATE 1 #include "psout.h" #ifdef XP_USE_FREETYPE diff --git a/Xprint/ps/psout_ft.c b/Xprint/ps/psout_ft.c index 9db8d49ec6..938c8b1aed 100644 --- a/Xprint/ps/psout_ft.c +++ b/Xprint/ps/psout_ft.c @@ -23,7 +23,7 @@ THE SOFTWARE. #include #include -#include "os.h" +#include #define USE_PSOUT_PRIVATE 1 #include "psout.h" diff --git a/Xprint/ps/psout_ftpstype1.c b/Xprint/ps/psout_ftpstype1.c index 1d2f49ac70..2e77653d21 100644 --- a/Xprint/ps/psout_ftpstype1.c +++ b/Xprint/ps/psout_ftpstype1.c @@ -27,7 +27,7 @@ THE SOFTWARE. #include #include -#include "os.h" +#include #define USE_PSOUT_PRIVATE 1 #include "psout.h" diff --git a/Xprint/ps/psout_ftpstype3.c b/Xprint/ps/psout_ftpstype3.c index 74494ab9a0..82c5e5f051 100644 --- a/Xprint/ps/psout_ftpstype3.c +++ b/Xprint/ps/psout_ftpstype3.c @@ -23,7 +23,7 @@ THE SOFTWARE. #include #include -#include "os.h" +#include #define USE_PSOUT_PRIVATE 1 #include "psout.h" diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c index 2d16e37914..5c69d44d2c 100644 --- a/Xprint/raster/Raster.c +++ b/Xprint/raster/Raster.c @@ -62,7 +62,7 @@ copyright holders. #include #undef NEED_EVENTS #include -#include "misc.h" +#include #include "dixstruct.h" #include "scrnintstr.h" #include "screenint.h" diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h index 4819dcb8b3..af6f3fa1f2 100644 --- a/Xprint/raster/Raster.h +++ b/Xprint/raster/Raster.h @@ -57,7 +57,7 @@ typedef char *XPointer; #define Status int #define True 1 #define False 0 -#include "misc.h" +#include #include #include #include "attributes.h" diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c index 86ab1d41bd..811ac65caa 100644 --- a/Xprint/raster/RasterAttVal.c +++ b/Xprint/raster/RasterAttVal.c @@ -34,7 +34,7 @@ copyright holders. #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "scrnintstr.h" #include "screenint.h" diff --git a/afb/afbbres.c b/afb/afbbres.c index 87b598a427..5922bd8e13 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -50,7 +50,7 @@ SOFTWARE. /* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */ #include -#include "misc.h" +#include #include "afb.h" #include "maskbits.h" #include "miline.h" diff --git a/afb/afbbresd.c b/afb/afbbresd.c index fd8b88c00d..13cbf6a1f0 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -49,7 +49,7 @@ SOFTWARE. /* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */ #include -#include "misc.h" +#include #include "afb.h" #include "maskbits.h" #include "miline.h" diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c index 051544505c..2bdd1675ac 100644 --- a/afb/afbgetsp.c +++ b/afb/afbgetsp.c @@ -52,7 +52,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "region.h" #include "gc.h" #include "windowstr.h" diff --git a/afb/afbmisc.c b/afb/afbmisc.c index 31d3a6a75b..ee65118310 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -49,7 +49,7 @@ SOFTWARE. /* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */ #include -#include "misc.h" +#include #include "cursor.h" #include "scrnintstr.h" diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c index 0410606f3d..6aeb3c6031 100644 --- a/afb/afbsetsp.c +++ b/afb/afbsetsp.c @@ -52,7 +52,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "regionstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c index 85cd906fa5..ee20c981e7 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include -#include "misc.h" +#include #include "cfb.h" #include "cfbmskbits.h" #include "servermd.h" diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index fd4144f40c..44c8e0c8ea 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ #include -#include "misc.h" +#include #include "cfb.h" #include "cfbmskbits.h" #include "miline.h" diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index f00e051a14..b3d5b91c3f 100644 --- a/cfb/cfbgetsp.c +++ b/cfb/cfbgetsp.c @@ -51,7 +51,7 @@ SOFTWARE. #include #include "servermd.h" -#include "misc.h" +#include #include "region.h" #include "gc.h" #include "windowstr.h" diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index f6050fc264..9cb1c7b1d0 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.2 2004/04/23 19:00:12 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.3 2005/04/20 12:25:18 daniels Exp $ */ /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index c412103807..9bf126a121 100644 --- a/cfb/cfbsetsp.c +++ b/cfb/cfbsetsp.c @@ -51,7 +51,7 @@ SOFTWARE. #include #include "servermd.h" -#include "misc.h" +#include #include "regionstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/composite/compint.h b/composite/compint.h index 81b4027ecc..c5f283c953 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -25,9 +25,9 @@ #ifndef _COMPINT_H_ #define _COMPINT_H_ -#include "misc.h" +#include #include "scrnintstr.h" -#include "os.h" +#include #include "regionstr.h" #include "validate.h" #include "windowstr.h" diff --git a/damageext/damageextint.h b/damageext/damageextint.h index 7d8eebd88e..2f7b3ab45d 100644 --- a/damageext/damageextint.h +++ b/damageext/damageextint.h @@ -28,8 +28,8 @@ #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include diff --git a/dbe/dbe.c b/dbe/dbe.c index 855135c3b6..b705ead41a 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.2 2004/04/23 19:03:43 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.3 2005/04/20 12:25:19 daniels Exp $ */ /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * diff --git a/dbe/midbe.c b/dbe/midbe.c index 6083ad1a9c..48a42daee0 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -39,8 +39,8 @@ #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/dix/colormap.c b/dix/colormap.c index 7322671722..d64b9db235 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.6 2005/03/07 23:02:58 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */ /*********************************************************** @@ -52,10 +52,10 @@ SOFTWARE. #include #define NEED_EVENTS #include -#include "misc.h" +#include #include "dix.h" #include "colormapst.h" -#include "os.h" +#include #include "scrnintstr.h" #include "resource.h" #include "windowstr.h" diff --git a/dix/devices.c b/dix/devices.c index d99fcdd369..82dabcf0f5 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -48,10 +48,10 @@ SOFTWARE. /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/dix/devices.c,v 1.5 2005/05/22 01:12:49 alanc Exp $ */ #include -#include "misc.h" +#include #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES diff --git a/dix/dispatch.c b/dix/dispatch.c index bad17beaf3..09445e038f 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 6f71cb1d4e..cbdd044e4f 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.5 2005/04/20 13:33:54 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -59,7 +59,7 @@ Equipment Corporation. #include "resource.h" #include "dixstruct.h" #include "cursorstr.h" -#include "misc.h" +#include #include "opaque.h" #include "dixfontstr.h" #include "closestr.h" diff --git a/dix/dixutils.c b/dix/dixutils.c index 92cc763a5e..ac5636f938 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -86,7 +86,7 @@ Author: Adobe Systems Incorporated #include #include -#include "misc.h" +#include #include "windowstr.h" #include "dixstruct.h" #include "pixmapstr.h" diff --git a/dix/events.c b/dix/events.c index cbac853448..aea54187da 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.10 2005/06/10 04:01:14 ajax Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.12 2005/06/15 16:46:59 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ /************************************************************ @@ -112,7 +112,7 @@ of the copyright holder. /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ #include -#include "misc.h" +#include #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES diff --git a/dix/extension.c b/dix/extension.c index bbd179a8b1..f65565df2b 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -51,7 +51,7 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "gcstruct.h" diff --git a/dix/gc.c b/dix/gc.c index 426cae5ee2..743d6e674f 100644 --- a/dix/gc.c +++ b/dix/gc.c @@ -51,7 +51,7 @@ SOFTWARE. #include #include #include -#include "misc.h" +#include #include "resource.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/dix/globals.c b/dix/globals.c index c7190f6c0c..3c15c5a0a0 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.3 2004/09/22 17:20:55 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ @@ -51,14 +51,14 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "windowstr.h" #include "scrnintstr.h" #include "input.h" #include "dixfont.h" #include "site.h" #include "dixstruct.h" -#include "os.h" +#include ScreenInfo screenInfo; KeybdCtrl defaultKeyboardControl = { diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c index 88b3bb895b..5499cabc59 100644 --- a/dix/glyphcurs.c +++ b/dix/glyphcurs.c @@ -47,7 +47,7 @@ SOFTWARE. /* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "misc.h" +#include #include "fontstruct.h" #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/dix/grabs.c b/dix/grabs.c index 5a767a6418..5887d2aab4 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -49,7 +49,7 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ #include -#include "misc.h" +#include #define NEED_EVENTS #include #include "windowstr.h" diff --git a/dix/initatoms.c b/dix/initatoms.c index 8253a72748..96b758b776 100644 --- a/dix/initatoms.c +++ b/dix/initatoms.c @@ -5,7 +5,7 @@ #include #include -#include "misc.h" +#include #include "dix.h" void MakePredeclaredAtoms() { diff --git a/dix/main.c b/dix/main.c index 87ff45a362..a8e4f05a45 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.11 2005/05/22 01:12:49 alanc Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** @@ -84,8 +84,8 @@ Equipment Corporation. #include /* for unistd.h */ #include #include "scrnintstr.h" -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/dix/pixmap.c b/dix/pixmap.c index 18e7b93946..eef23673f1 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -30,8 +30,8 @@ from The Open Group. #include #include "scrnintstr.h" -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/dix/privates.c b/dix/privates.c index a8f3ee9aa7..905fe3d503 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -1,5 +1,5 @@ /* $Xorg: privates.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/dix/privates.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -31,8 +31,8 @@ from The Open Group. #include #include "scrnintstr.h" -#include "misc.h" -#include "os.h" +#include +#include #include "windowstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/dix/resource.c b/dix/resource.c index f0035f48a6..9f3794bd38 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -74,7 +74,7 @@ Equipment Corporation. ******************************************************************/ /* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.4 2005/03/07 23:02:58 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.5 2005/04/20 12:25:19 daniels Exp $ */ /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ /* Routines to manage various kinds of resources: @@ -103,8 +103,8 @@ Equipment Corporation. #define NEED_EVENTS #include -#include "misc.h" -#include "os.h" +#include +#include #include "resource.h" #include "dixstruct.h" #include "opaque.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index 1c6da139f6..5d1284c08a 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -52,7 +52,7 @@ SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #include -#include "misc.h" +#include #include "dixstruct.h" #include "fontstruct.h" #include "scrnintstr.h" diff --git a/dix/swapreq.c b/dix/swapreq.c index 8f9036da1f..2e8acaee97 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -52,7 +52,7 @@ SOFTWARE. #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" /* for SendEvent */ #include "swapreq.h" diff --git a/dix/window.c b/dix/window.c index ac6f775ba7..858d650899 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.7 2005/03/07 23:02:59 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* @@ -80,9 +80,9 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */ -#include "misc.h" +#include #include "scrnintstr.h" -#include "os.h" +#include #include "regionstr.h" #include "validate.h" #include "windowstr.h" diff --git a/dix/xpstubs.c b/dix/xpstubs.c index f7f37b64a3..5f69e61191 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -27,7 +27,7 @@ from The Open Group. /* $Xorg: xpstubs.c,v 1.5 2001/03/08 17:52:08 pookie Exp $ */ -#include "misc.h" +#include #include "font.h" #ifdef XPRINT #include "DiPrint.h" diff --git a/fb/fb.h b/fb/fb.h index ed813fff94..42e167777a 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.8 2004/12/04 00:42:50 kuhn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.9 2005/04/20 12:25:19 daniels Exp $ */ #ifndef _FB_H_ #define _FB_H_ diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 394c349e8d..5b735fcc46 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.5 2005/01/13 20:49:21 sandmann Exp $ + * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.10 2005/07/01 10:05:42 lars Exp $ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. diff --git a/fb/fbgc.c b/fb/fbgc.c index 29d6d491b4..76b8fdc8a1 100644 --- a/fb/fbgc.c +++ b/fb/fbgc.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.2 2004/04/23 19:05:14 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.3 2004/12/04 00:42:50 kuhn Exp $ */ /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ #include "fb.h" diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 348ea49318..c2a265c126 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.2 2004/04/23 19:05:14 eich Exp $ + * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.3 2004/12/04 00:42:50 kuhn Exp $ * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $ * * Copyright © 1998 Keith Packard diff --git a/fb/fboverlay.c b/fb/fboverlay.c index 35b930bdbe..c165df9c4a 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -23,7 +23,7 @@ * Author: Keith Packard, SuSE, Inc. */ -/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.4 2004/07/30 20:30:51 ajax Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */ #include "fb.h" #include "fboverlay.h" diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 82f2d5df00..750b9e5562 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/fb/fbscreen.c,v 1.3 2004/05/16 05:08:39 alanc Exp $ +/* $XdotOrg: xc/programs/Xserver/fb/fbscreen.c,v 1.4 2004/12/04 00:42:50 kuhn Exp $ * Id: fbscreen.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * * Copyright © 1998 Keith Packard diff --git a/fb/fbwindow.c b/fb/fbwindow.c index d51c3676d3..4968d29afd 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.6 2004/12/06 15:53:00 eich Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index e6fb781d06..ce48c75abb 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -29,12 +29,12 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.5 2004/09/22 23:38:32 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.6 2005/04/20 12:25:19 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */ #include #include -#include "os.h" +#include #include "servermd.h" #include "inputstr.h" #include "scrnintstr.h" diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index bcc430e584..5bf163708f 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -33,12 +33,12 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2004/07/30 17:37:09 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */ #include #include -#include "os.h" +#include #include "servermd.h" #include "inputstr.h" #include "scrnintstr.h" diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h index ec8ec7d494..828fce17f1 100644 --- a/hw/darwin/quartz/XServer.h +++ b/hw/darwin/quartz/XServer.h @@ -29,7 +29,7 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */ #define BOOL xBOOL diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index d79df4cee2..1933ba05b5 100644 --- a/hw/darwin/quartz/applewm.c +++ b/hw/darwin/quartz/applewm.c @@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include "misc.h" +#include #include "dixstruct.h" #include "globals.h" #include "extnsionst.h" diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c index 426fbb2005..05542eafe9 100644 --- a/hw/darwin/quartz/fullscreen/fullscreen.c +++ b/hw/darwin/quartz/fullscreen/fullscreen.c @@ -25,7 +25,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.2 2004/04/23 19:16:21 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2004/07/30 19:12:18 torrey Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index 341f7778d3..22151198a6 100644 --- a/hw/darwin/quartz/quartz.c +++ b/hw/darwin/quartz/quartz.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.2 2004/04/23 19:15:17 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /************************************************************** * * Quartz-specific support for the Darwin X Server diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h index 6620b66777..cee43325de 100644 --- a/hw/darwin/quartz/quartz.h +++ b/hw/darwin/quartz/quartz.h @@ -30,7 +30,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.2 2004/04/23 19:15:17 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */ #ifndef _QUARTZ_H diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index 4e5abdb515..949f724c1c 100644 --- a/hw/darwin/quartz/quartzCommon.h +++ b/hw/darwin/quartz/quartzCommon.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.2 2004/04/23 19:15:17 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /* * quartzCommon.h * diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index d4cd27b8f4..9e6676b99b 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index e8e49f9657..6846afab35 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -47,7 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h index d82aef62b1..5b881c7253 100644 --- a/hw/darwin/quartz/xpr/xpr.h +++ b/hw/darwin/quartz/xpr/xpr.h @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.2 2004/04/23 19:16:52 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #ifndef XPR_H diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index 235028ff07..0dff7c56d2 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -27,7 +27,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.3 2004/10/08 00:35:05 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2005/04/20 12:25:20 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #include "xpr.h" diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index f178dec8a2..eaad13f7b4 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/darwin/quartz/xpr/xprScreen.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.4 2004/08/12 20:24:36 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.5 2004/09/18 00:38:30 torrey Exp $ */ /* * Xplugin rootless implementation screen functions */ diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index c91b583042..1731b92cda 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -45,8 +45,8 @@ #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #define EXTENSION_PROC_ARGS void * #include "extnsionst.h" diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 9abd81ee87..903f61c281 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 362886a025..269923c29a 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.6 2004/12/06 21:54:19 herrb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.8 2005/05/18 10:31:53 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 669c2f8538..d35f0c8d72 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -32,7 +32,7 @@ #include #include #include -#include "os.h" +#include #ifdef XFree86LOADER #include "loaderProcs.h" #endif diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index dfe397a63a..3d9bdfe222 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.2 2004/04/23 19:20:32 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index f6df8d7225..50a3e66d23 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.11 2003/11/11 21:02:28 dawes Exp $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.4 2004/09/22 17:20:56 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.5 2005/04/20 12:25:21 daniels Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -33,7 +33,7 @@ */ #include -#include "os.h" +#include #include "globals.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index 6ac9c21baf..15aafb8179 100644 --- a/hw/xfree86/common/xf86Date.h +++ b/hw/xfree86/common/xf86Date.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.3 2004/08/12 05:11:57 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.4 2004/08/16 22:48:50 kem Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */ /* * Copyright (c) 2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index 34be37534a..76b69d79be 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -34,7 +34,7 @@ #include #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c index adfddacb17..f34d19a320 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #ifdef XFree86LOADER #include "loaderProcs.h" #include "xf86Config.h" diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index 3f56487b3e..fe07d28751 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #ifdef XFree86LOADER #include "loaderProcs.h" #endif diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 2e9b3f1733..14d653f1a4 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -49,7 +49,7 @@ */ /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.8 2005/04/20 12:25:21 daniels Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.9 2005/04/21 00:31:31 daniels Exp $ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ @@ -60,7 +60,7 @@ #include #include #include -#include "misc.h" +#include #include "compiler.h" diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 1ab71400c1..653b4433cb 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -32,7 +32,7 @@ */ #include -#include "os.h" +#include #include "windowstr.h" #include "propertyst.h" #include "xf86.h" diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index e522ceebed..50466697b5 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -37,7 +37,7 @@ */ #include -#include "os.h" +#include #include "servermd.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index dc1ce735fc..338e28297f 100644 --- a/hw/xfree86/common/xf86Io.c +++ b/hw/xfree86/common/xf86Io.c @@ -49,7 +49,7 @@ */ /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 1.2 2004/07/28 03:57:19 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ #define NEED_EVENTS #include diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index 198b24d22c..d59bea0c82 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -36,7 +36,7 @@ #endif #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index a6bf550ae4..6209290dfc 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.2 2004/04/23 19:20:32 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.4 2005/05/18 10:31:53 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -37,7 +37,7 @@ */ #include -#include "os.h" +#include #include "servermd.h" #include "mibank.h" #include "globals.h" diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index f0ac3bd591..7f4179cc32 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -43,7 +43,7 @@ #ifndef _XF86MODULE_H #define _XF86MODULE_H -#include "misc.h" +#include #include "xf86Version.h" #ifndef NULL #define NULL ((void *)0) diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index eeef61d681..ae131aa7c1 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Xinput.h" #include "xf86Optrec.h" diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index bbbb80cba6..7c77777e4e 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2005/03/16 12:16:06 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.9 2005/04/20 12:25:21 daniels Exp $ */ /* * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * @@ -24,7 +24,7 @@ */ #include -#include "os.h" +#include #include "mibank.h" #include "globals.h" #include "xf86.h" diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index d40fcdaed2..45746bc901 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */ /* @@ -59,4 +59,4 @@ #endif /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 525ab04c9a..1b2b63bbfd 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -36,7 +36,7 @@ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 833cbcdbb8..e9f9fae3e0 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -48,7 +48,7 @@ * authorization from the copyright holder(s) and author(s). */ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 1.3 2005/01/19 22:23:20 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 1.4 2005/04/20 12:25:21 daniels Exp $ */ #include #include diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index 2b1d21ec14..e27dceee9d 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.4 2004/12/04 00:42:52 kuhn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.5 2005/04/20 12:25:21 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. @@ -37,7 +37,7 @@ #endif #include -#include "misc.h" +#include #include #include "colormapst.h" #include "scrnintstr.h" diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 03722b7500..0d448e27b1 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index 60b9595fc3..fef4d633c1 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -27,7 +27,7 @@ * authorization from the copyright holder(s) and author(s). */ -#include "misc.h" +#include #include "xf86.h" #include diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index b9d7386ecc..56a79ac23b 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 7be4a510b7..904de01d60 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index ee22056d6c..da732e0a5f 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -35,7 +35,7 @@ #include #include #include -#include "os.h" +#include #include "Pci.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index cd354e7771..5b747e2481 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -26,7 +26,7 @@ #include #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index a90b5483d8..67052b2201 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -35,7 +35,7 @@ #ifndef _XF86STR_H #define _XF86STR_H -#include "misc.h" +#include #include "input.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 43e849f2a6..79cda35c52 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -30,7 +30,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index d74214a2fe..f6d0aaf399 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -27,7 +27,7 @@ * authorization from the copyright holder(s) and author(s). */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index 370143c3dd..af729a01fd 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -1,7 +1,7 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.2 2004/04/23 19:20:32 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ #include -#include "os.h" +#include #include "servermd.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index e89cc39c1a..47005320a6 100644 --- a/hw/xfree86/common/xorgVersion.h +++ b/hw/xfree86/common/xorgVersion.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.3 2004/08/16 02:07:53 kem Exp $ */ /* * Copyright (c) 2004, X.Org Foundation @@ -48,4 +48,4 @@ # define XORG_VERSION_SNAP XORG_GET_SNAP_VERSION(XORG_VERSION_CURRENT) #endif -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.3 2004/08/16 02:07:53 kem Exp $ */ diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index c4cc3c6245..577e8169a9 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -5,7 +5,7 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" /* #include "xf86_ansic.h" */ /* #include "xf86_OSproc.h" */ diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index 58616d308b..b173636488 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -7,7 +7,7 @@ * * Copyright 1998 by Egbert Eich */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index 36bb10cdaa..a2437a4ba9 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -4,7 +4,7 @@ * * Copyright 1998 by Egbert Eich */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 8af7702d89..391f220cdf 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -4,7 +4,7 @@ * * Copyright 1998 by Egbert Eich */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c index caea5caa19..8329e129ad 100644 --- a/hw/xfree86/ddc/print_vdif.c +++ b/hw/xfree86/ddc/print_vdif.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */ #include "vdif.h" -#include "misc.h" +#include #include "xf86DDC.h" static void print_vdif(xf86VdifPtr l, char *s); diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 2cdeacab57..3490fd5336 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -4,7 +4,7 @@ * * Copyright 1998,1999 by Egbert Eich */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index b0f239936e..cb58e7fb90 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2004/04/23 18:44:43 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.3 2005/04/20 12:25:13 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */ #ifndef INITARGS diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c index 928ae9fd20..efa7d1b400 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga.c +++ b/hw/xfree86/dixmods/extmod/xf86dga.c @@ -11,7 +11,7 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index deb1b11e52..7224a5eeeb 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -10,7 +10,7 @@ #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "dixevents.h" #include "pixmapstr.h" diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c index 4f263ce20e..e5ce56fc49 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -10,7 +10,7 @@ #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 464ba23dc7..99de107c4c 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -29,7 +29,7 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ -/* $XdotOrg: xc/programs/Xserver/Xext/xf86vmode.c,v 1.3 2004/12/12 23:29:20 krh Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xf86vmode.c,v 1.4 2005/04/20 12:25:12 daniels Exp $ */ /* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ @@ -37,7 +37,7 @@ from Kaleb S. KEITHLEY #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 7466e9a4f7..0ffca8397f 100644 --- a/hw/xfree86/dixmods/extmod/xvmod.c +++ b/hw/xfree86/dixmods/extmod/xvmod.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ #include -#include "misc.h" +#include #include "scrnintstr.h" #include "gc.h" #include diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 13f27bf645..094703bc0f 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -46,7 +46,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index bb7a89ee04..1fa7a8edc2 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -1,3 +1,4 @@ +/* $XdotOrg: xc/programs/Xserver/GL/dri/drimodule.c,v 1.2 2004/04/23 18:44:36 eich Exp $ */ /************************************************************************** Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. @@ -24,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.6 2001/12/10 19:07:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.5 2001/06/15 21:22:39 dawes Exp $ */ /* * Authors: @@ -43,7 +44,7 @@ static XF86ModuleVersionInfo VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_EXTENSION, ABI_EXTENSION_VERSION, diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 31fb1d7489..3df025b0a0 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -44,7 +44,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_EVENTS #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index cd7942a629..e754a2013d 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index 51ea1bab57..862f85b4ed 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index f5a9e414e2..0ff83881b9 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index 3a18e5eb82..59424f20f2 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index 3e25c5aacb..90283ccb3b 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index b7a7f1cc4d..383fa08a0a 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 7c1fb3497b..934f016df1 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index fd912f681a..090827a057 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index 106ab21166..8089a46dab 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index d2140d6096..9fbe347e6c 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index a197cc49ce..3dc3264c39 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index 1b08c3dc70..b417d30076 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index 47baa655c6..8a48b52456 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index 2617392682..9d0f6ecd73 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index fe00d5b7df..6a0e382398 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index 31c6b2749d..9296cc72f0 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index 56ca5a9862..349443c9cf 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index d2aab860ca..0530e3b7ac 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 1959609dc0..148b8fb7e5 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index c5aa5098b8..297606fc5c 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c index aa7d62dc55..fb243f8b5c 100644 --- a/hw/xfree86/i2c/uda1380.c +++ b/hw/xfree86/i2c/uda1380.c @@ -5,8 +5,8 @@ * License: GPL * * $Log$ - * Revision 1.1 2005/04/17 22:58:03 bogdand - * This is the UDA1380 sound coder-decoder module + * Revision 1.2 2005/07/01 22:43:11 daniels + * Change all misc.h and os.h references to . * * ************************************************************************************/ diff --git a/hw/xfree86/i2c/uda1380.h b/hw/xfree86/i2c/uda1380.h index 9254ff6f91..a376b4038a 100644 --- a/hw/xfree86/i2c/uda1380.h +++ b/hw/xfree86/i2c/uda1380.h @@ -5,8 +5,8 @@ * License: GPL * * $Log$ - * Revision 1.1 2005/04/17 22:58:03 bogdand - * This is the UDA1380 sound coder-decoder module + * Revision 1.2 2005/07/01 22:43:11 daniels + * Change all misc.h and os.h references to . * * ************************************************************************************/ diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index f6988842f8..4253d8075d 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -9,7 +9,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ #if 1 -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c index 971c58ca37..a79375abcb 100644 --- a/hw/xfree86/loader/aoutloader.c +++ b/hw/xfree86/loader/aoutloader.c @@ -45,7 +45,7 @@ #endif #include -#include "os.h" +#include #include "aout.h" #include "sym.h" diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c index c7442b3fa7..366bf6eaf9 100644 --- a/hw/xfree86/loader/coffloader.c +++ b/hw/xfree86/loader/coffloader.c @@ -40,7 +40,7 @@ #endif #include -#include "os.h" +#include #include "coff.h" #include "sym.h" diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 3a614a9563..b1997cd404 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.8 2005/04/01 20:05:11 ajax Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.12 2005/05/30 18:44:55 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03 * 17:11:29 tsi Exp $ */ @@ -59,9 +59,9 @@ #include "dixevents.h" #include "dixfont.h" #include "dixstruct.h" -#include "misc.h" +#include #include "globals.h" -#include "os.h" +#include #include "osdep.h" #include "resource.h" #include "servermd.h" diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index 7527b5dd73..a089ba5483 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -30,7 +30,7 @@ #include #include -#include "os.h" +#include #include "sym.h" #include "loader.h" diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index fd51e7cef8..173695006e 100644 --- a/hw/xfree86/loader/elfloader.c +++ b/hw/xfree86/loader/elfloader.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.5 2005/04/04 09:47:07 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.7 2005/04/23 19:01:13 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */ /* @@ -47,7 +47,7 @@ #endif #include -#include "os.h" +#include #include "elf.h" #include "sym.h" diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c index 11fb504726..f53da6e3a7 100644 --- a/hw/xfree86/loader/extsym.c +++ b/hw/xfree86/loader/extsym.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.4 2004/08/09 03:40:50 krh Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.5 2004/09/14 23:21:22 gisburn Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */ /* @@ -27,7 +27,7 @@ #include "resource.h" #include "sym.h" -#include "misc.h" +#include #ifdef PANORAMIX #include "panoramiX.h" #endif diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index 12f3c63b45..d424f04613 100644 --- a/hw/xfree86/loader/hash.c +++ b/hw/xfree86/loader/hash.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.2 2004/04/23 19:54:06 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.3 2005/04/20 12:25:34 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.24 2003/11/17 22:20:40 dawes Exp $ */ /* @@ -24,7 +24,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "os.h" +#include #include #undef abs #include diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 8703e48db0..4e47295262 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -69,7 +69,7 @@ #include "elf.h" #include "coff.h" -#include "os.h" +#include #include "sym.h" #include "loader.h" #include "loaderProcs.h" diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index ffc98b2438..705460eb9a 100644 --- a/hw/xfree86/loader/loadext.c +++ b/hw/xfree86/loader/loadext.c @@ -30,7 +30,7 @@ #define LOADERDECLARATIONS #include "loaderProcs.h" -#include "misc.h" +#include #include "xf86.h" ExtensionModule *ExtensionModuleList = NULL; diff --git a/hw/xfree86/loader/loadfont.c b/hw/xfree86/loader/loadfont.c index 6886692da1..69a16ac801 100644 --- a/hw/xfree86/loader/loadfont.c +++ b/hw/xfree86/loader/loadfont.c @@ -30,7 +30,7 @@ #define LOADERDECLARATIONS #include "loaderProcs.h" -#include "misc.h" +#include #include "xf86.h" FontModule *FontModuleList = NULL; diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 148073cf9e..b3c9f736be 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -49,13 +49,13 @@ * authorization from the copyright holder(s) and author(s). */ -#include "os.h" +#include /* For stat() and related stuff */ #define NO_OSLIB_PROTOTYPES #include "xf86_OSlib.h" #define LOADERDECLARATIONS #include "loaderProcs.h" -#include "misc.h" +#include #include "xf86.h" #include "xf86Priv.h" #ifdef XINPUT diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c index 33eb6d3f32..5977546b8d 100644 --- a/hw/xfree86/loader/misym.c +++ b/hw/xfree86/loader/misym.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.3 2005/06/26 02:48:36 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.38 2003/10/15 16:29:04 dawes Exp $ */ /* @@ -52,7 +52,7 @@ */ #include "sym.h" -#include "misc.h" +#include #include "mi.h" #include "mibank.h" #include "miwideline.h" diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 12c3a07e6c..ee71f4ff8a 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -54,7 +54,7 @@ #include #include #include "sym.h" -#include "misc.h" +#include #include "mi.h" #include "cursor.h" #include "mipointer.h" diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index af2138e26a..ef442b4f7b 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #define XF86_OS_PRIVS diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index bed119fe27..77a2a79a8a 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,7 +1,7 @@ /* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86Axp.h" diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 7f24124dcf..71bc916878 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -23,7 +23,7 @@ /* Modified for FreeBSD by David Dawes */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.8 2002/08/06 13:20:47 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ #include #include @@ -33,7 +33,7 @@ #include #ifdef XFree86LOADER -#include "misc.h" +#include #include "xf86_libc.h" #endif #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index e0e30bc036..07cc55f54d 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -29,7 +29,7 @@ /* $OpenBSD: bsd_kqueue_apm.c,v 1.5 2002/07/30 23:07:42 matthieu Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #define XF86_OS_PRIVS diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index a8b7ef4923..d1284dc448 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -106,7 +106,7 @@ #define _XF86PCI_H 1 #include #include -#include "misc.h" +#include #define PCI_NOT_FOUND 0xFFFFFFFFU diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index 9ce6f38836..44dcb1198c 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #define XF86_OS_PRIVS diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index c96e7a118f..d408d16234 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -2,7 +2,7 @@ #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86Axp.h" diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 1a44425479..0bd33aea78 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 1.4 2005/01/28 16:12:59 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 1.5 2005/04/20 12:25:35 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.14 2001/10/31 22:50:30 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 25404b02be..6b5bfa9994 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -2,7 +2,7 @@ #include #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #define XF86_OS_PRIVS diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index 7889617e32..a94ad34cc3 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.8 2001/10/28 03:34:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.7 1999/01/14 13:05:05 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * @@ -38,7 +38,7 @@ int _xf86misc; /* For use only with gcc */ #ifdef __GNUC__ -#include "os.h" +#include char * debug_alloca(char *file, int line, int size) diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index 64d2de967f..66d15b2613 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -46,7 +46,7 @@ #include #include #include -#include "os.h" +#include #include #include #include diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index 5e8efe330e..4225e6dd4a 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -29,7 +29,7 @@ /* Stubs for the OS-support layer power-management functions. */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #define XF86_OS_PRIVS diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index 6c78cf71a3..358981f107 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -25,7 +25,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.2 2004/06/28 18:08:26 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.3 2005/04/20 12:25:38 daniels Exp $ */ #ifdef XFree86Server #ifdef __UNIXOS2__ diff --git a/hw/xfree86/os-support/solaris/agpgart.h b/hw/xfree86/os-support/solaris/agpgart.h index 8942bdcb37..09d63ec267 100644 --- a/hw/xfree86/os-support/solaris/agpgart.h +++ b/hw/xfree86/os-support/solaris/agpgart.h @@ -1,4 +1,4 @@ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/agpgart.h,v 1.1 2005/06/09 03:11:58 alanc Exp $ */ /* * AGPGART module version 0.99 * Copyright (C) 1999 Jeff Hartmann diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c index 9e5886c28a..126415e6e4 100644 --- a/hw/xfree86/os-support/solaris/sun_agp.c +++ b/hw/xfree86/os-support/solaris/sun_agp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_agp.c,v 1.1 2005/06/09 03:11:58 alanc Exp $ */ /* * Abstraction of the AGP GART interface. * diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 358a44f35d..97c6dba393 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -22,7 +22,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.3 2005/05/21 07:46:37 alanc Exp $ */ #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 7e49988172..56929d69b2 100644 --- a/hw/xfree86/os-support/solaris/sun_kbd.c +++ b/hw/xfree86/os-support/solaris/sun_kbd.c @@ -23,12 +23,15 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.3 2004/06/13 04:50:21 alanc Exp $ */ +#include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" static int sun_otranslation = -1; static int sun_odirect = -1; +int sun_ktype; int xf86GetKbdLeds() @@ -53,7 +56,8 @@ xf86SetKbdRepeat(char rad) void xf86KbdInit() { - int ktype, klayout; + int klayout; + const char *ktype_name; if (xf86Info.kbdFd < 0) { xf86Info.kbdFd = open("/dev/kbd", O_RDWR|O_NONBLOCK); @@ -62,11 +66,11 @@ xf86KbdInit() } /* - * None of the followin should ever fail. If it does, something is + * None of the following should ever fail. If it does, something is * broken (IMO) - DWH 8/21/99 */ - if (ioctl(xf86Info.kbdFd, KIOCTYPE, &ktype) < 0) + if (ioctl(xf86Info.kbdFd, KIOCTYPE, &sun_ktype) < 0) FatalError("Unable to determine keyboard type: %d\n", errno); if (ioctl(xf86Info.kbdFd, KIOCLAYOUT, &klayout) < 0) @@ -77,6 +81,21 @@ xf86KbdInit() if (ioctl(xf86Info.kbdFd, KIOCGDIRECT, &sun_odirect) < 0) FatalError("Unable to determine keyboard direct setting\n"); + + switch (sun_ktype) { + case KB_SUN3: + ktype_name = "Sun Type 3"; break; + case KB_SUN4: + ktype_name = "Sun Type 4/5/6"; break; + case KB_USB: + ktype_name = "USB"; break; + case KB_PC: + ktype_name = "PC"; break; + default: + ktype_name = "Unknown"; break; + } + xf86Msg(X_PROBED, "Keyboard type: %s (%d)\n", ktype_name, sun_ktype); + xf86Msg(X_PROBED, "Keyboard layout: %d\n", klayout); } int diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index 1e37c4f270..eba420937c 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -23,7 +23,7 @@ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.3 2004/07/28 03:57:19 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2005/05/21 07:46:37 alanc Exp $ */ #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c index 4c8f63e8bd..b3fedbd0fc 100644 --- a/hw/xfree86/os-support/solaris/sun_mouse.c +++ b/hw/xfree86/os-support/solaris/sun_mouse.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.5 2005/06/03 21:49:11 alanc Exp $ */ /* * Copyright 1999-2001 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index a38575d625..b65420e2b4 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -67,7 +67,7 @@ */ /* $XConsortium: xf86_OSlib.h /main/22 1996/10/27 11:06:31 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 1.5 2005/03/02 11:20:29 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 1.7 2005/05/21 07:46:37 alanc Exp $ */ /* * This is private, and should not be included by any drivers. Drivers diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index 86a9b41791..9bae4ba69c 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v 3.51 2003/08/24 17:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v 3.53 2003/10/28 18:36:37 tsi Exp $ */ /* * Copyright 1997-2003 by The XFree86 Project, Inc * @@ -86,7 +86,7 @@ #endif #ifndef FONTMODULE -#include "misc.h" +#include #endif #include "xf86_libc.h" #ifndef SHRT_MAX @@ -239,6 +239,8 @@ extern int xf86strcasecmp(const char*,const char*); extern char* xf86strcpy(char*,const char*); extern xf86size_t xf86strcspn(const char*,const char*); extern char* xf86strerror(int); +extern xf86size_t xf86strlcat(char*,const char*,xf86size_t); +extern xf86size_t xf86strlcpy(char*,const char*,xf86size_t); extern xf86size_t xf86strlen(const char*); extern char* xf86strncat(char *, const char *, xf86size_t); extern int xf86strncmp(const char*,const char*,xf86size_t); diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index eb3a1dfda9..5f0f78f02b 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 1.4 2005/03/08 10:26:59 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 1.6 2005/04/22 22:04:37 alanc Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 72a4d5942e..3fa3ee9116 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index 783d79b935..68adaa31a3 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -4,7 +4,7 @@ #define __XF86RAC_H 1 #include "screenint.h" -#include "misc.h" +#include #include "xf86.h" Bool xf86RACInit(ScreenPtr pScreen, unsigned int flag); diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index ce7938a682..675fce09cc 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 7a67ee0fd1..4a82e65115 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -52,7 +52,7 @@ /* XXX This is including a lot of stuff that modules should not include! */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86Pci.h" diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 0c441cb1ca..960aa8af74 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -10,7 +10,7 @@ #include #include -#include "misc.h" +#include #include "pixmapstr.h" #include "input.h" #include "font.h" diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c index 28495013f9..fbc6207093 100644 --- a/hw/xfree86/utils/gtf/gtf.c +++ b/hw/xfree86/utils/gtf/gtf.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2004/04/23 19:53:57 eich Exp $ */ /* gtf.c Generate mode timings using the GTF Timing Standard * * gcc gtf.c -o gtf -lm -Wall diff --git a/hw/xfree86/utils/pcitweak/pcitweak.c b/hw/xfree86/utils/pcitweak/pcitweak.c index a7c6a32632..f11922ece1 100644 --- a/hw/xfree86/utils/pcitweak/pcitweak.c +++ b/hw/xfree86/utils/pcitweak/pcitweak.c @@ -33,7 +33,7 @@ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c index 4ed4a1108d..b1378ff596 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -26,7 +26,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ #include -#include "os.h" +#include #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c index 60f1176c1d..6fe59a1f10 100644 --- a/hw/xfree86/utils/xorgcfg/loader.c +++ b/hw/xfree86/utils/xorgcfg/loader.c @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.2 2004/04/23 19:54:18 eich Exp $ + * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.3 2004/12/04 00:43:11 kuhn Exp $ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $ */ diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index 509b74e768..29c1c0e2b8 100644 --- a/hw/xfree86/utils/xorgconfig/cards.c +++ b/hw/xfree86/utils/xorgconfig/cards.c @@ -1,4 +1,4 @@ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 1.3 2004/08/13 23:57:38 alanc Exp $ */ /* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */ diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index cc6dc46647..86580a7424 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -94,7 +94,7 @@ * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) */ /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.11 2005/01/30 21:18:46 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.14 2005/05/28 00:08:03 alanc Exp $ */ #include #include diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index e1ee6f27c0..fb0e65b7ed 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -13,7 +13,7 @@ #define _NEED_SYSI86 #include -#include "misc.h" +#include #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index c200aee9af..14dbb4be3d 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -15,7 +15,7 @@ #define _VGAHW_H #include -#include "misc.h" +#include #include "input.h" #include "scrnintstr.h" #include "colormapst.h" diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 36e3a3800e..5e2965ca9e 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -7,7 +7,7 @@ to the fg and bg so CopyPlane can use this. */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index a130601783..5bf4c98584 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index 611acc502c..b614a8afbf 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -10,7 +10,7 @@ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index 24e8c907f7..13b1a6d053 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index a9660d3ece..de9bd2b929 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ #include -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index d59dc4dbaa..fe73aef62e 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index a7945b068a..699491f668 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -34,7 +34,7 @@ * * Clipped arcs are dispatched to FillSpans. */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index fcd8783c8a..0cf273c5b7 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -31,7 +31,7 @@ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index 89d6756fb0..b7178b9af4 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index 945c2e6ef9..207a126680 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index acd56c344b..d7e6d4d52e 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index 9af3aeec18..6faa7685ed 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 822662e39c..090436b9b6 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 9378bcf6c4..a17b152daa 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index b40ad4aea1..2f9bdb7594 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ #include -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index f63dc9ff75..4c9b01018f 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 9e6f61f6f4..4882f76a64 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -18,7 +18,7 @@ ********************************************************************/ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index e99f9c34c0..53d0eb841a 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -7,7 +7,7 @@ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 967bb19939..044e727ee3 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,7 +1,7 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.2 2004/04/23 19:54:16 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index dbd2357c2e..7f5923e426 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -6,7 +6,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 9d2622e951..718a992750 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 887fa1accc..abe1bbb072 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,7 +1,7 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.2 2004/04/23 19:54:16 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index c84a59d834..a80388eae0 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 29b6d764aa..0f39db96d2 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index d39ca834b0..8a7d73a339 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 3facb7af80..113be1536f 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index ca7c3fb7bf..a78ed3758a 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 432cef4b2f..a4298dddae 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -18,7 +18,7 @@ ********************************************************************/ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index 29faa1ab03..8664648541 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: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.3 2004/08/29 00:48:17 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.4 2005/04/20 12:25:40 daniels Exp $ */ /* XAAPolylinesWideSolid does not maintain a span list and subsequently does @@ -25,7 +25,7 @@ Original mi code written by Keith Packard. #endif #endif -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index 9b5ea57ead..9c99b1c85e 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -31,7 +31,7 @@ #define MIN(a,b) (((a)<(b))?(a):(b)) #define ABS(x) (((x)>0)?(x):-(x)) -#include "misc.h" +#include #include "xf86_ansic.h" #include "compiler.h" diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index 345492c593..f9642c0d42 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -24,7 +24,7 @@ /* $XConsortium: vgaVideo.h /main/4 1996/02/21 17:59:14 kaleb $ */ -#include "misc.h" /* GJA -- for pointer data type */ +#include /* GJA -- for pointer data type */ #ifdef lint #if defined(volatile) #undef volatile diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c index b517769d98..06af87b571 100644 --- a/hw/xfree86/xf8_16bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c @@ -8,7 +8,7 @@ #include #include -#include "misc.h" +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 0fcd18843f..1088a10f97 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.2 2004/04/23 19:54:21 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.3 2005/04/20 12:25:40 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ #include diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index f67a7093c8..19b13939b4 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -3,7 +3,7 @@ #include #include -#include "misc.h" +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 71dddafe6f..a45804e2e4 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -6,7 +6,7 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ -#include "misc.h" +#include #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c index 8ee2a0e43e..ca4322e1a7 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -11,7 +11,7 @@ #include #include -#include "misc.h" +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c index 669ef9f638..8325810935 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -2,7 +2,7 @@ #include #include -#include "misc.h" +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 75aa396fbc..0998b1307e 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -18,7 +18,7 @@ is" without express or implied warranty. #include #include "screenint.h" #include "input.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "servermd.h" diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index cea8b60d02..8ba943e918 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -18,7 +18,7 @@ is" without express or implied warranty. #include #include "screenint.h" #include "input.h" -#include "misc.h" +#include #include "cursor.h" #include "cursorstr.h" #include "scrnintstr.h" diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index 602a6c9b2c..51f7f943f7 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -19,7 +19,7 @@ is" without express or implied warranty. #include #include "screenint.h" #include "input.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "servermd.h" diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 604499f890..20bcac549b 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -19,7 +19,7 @@ is" without express or implied warranty. #include #include "screenint.h" #include "input.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "servermd.h" diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index 259466adcf..f78234ea05 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -17,7 +17,7 @@ is" without express or implied warranty. #include #include #include -#include "misc.h" +#include #include "regionstr.h" #include "font.h" #include "fontstruct.h" diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c index 421234316d..b7b22862c9 100644 --- a/hw/xnest/GetTime.c +++ b/hw/xnest/GetTime.c @@ -32,7 +32,7 @@ from the X Consortium. #include -#include "os.h" +#include #include CARD32 diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index 362e9a4b64..3b7ba8e040 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -18,7 +18,7 @@ is" without express or implied warranty. #include #include "screenint.h" #include "input.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "servermd.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index ba209b7324..eaf1f5609d 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -18,7 +18,7 @@ is" without express or implied warranty. #include #include "screenint.h" #include "input.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "servermd.h" diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index a65b0ffcd7..c63b080edc 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -1,5 +1,5 @@ /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.2 2004/04/23 19:54:21 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.4 2005/06/25 21:28:48 ajax Exp $ */ /* Copyright 1993 by Davor Matic @@ -21,7 +21,7 @@ is" without express or implied warranty. #include "keysym.h" #include "screenint.h" #include "inputstr.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "servermd.h" diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 7613122bed..e02064d6ef 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -19,7 +19,7 @@ is" without express or implied warranty. #include "screenint.h" #include "inputstr.h" #include "input.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "servermd.h" #include "mipointer.h" diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c index be9299c310..afe0281b16 100644 --- a/hw/xnest/TestExt.c +++ b/hw/xnest/TestExt.c @@ -20,7 +20,7 @@ is" without express or implied warranty. #undef Bool #include "screenint.h" #include "input.h" -#include "misc.h" +#include #include "scrnintstr.h" #include "servermd.h" #include "mipointer.h" diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index 5230b16e0d..0252d37a2e 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -34,7 +34,7 @@ /* Need Bool */ #include /* Need TRUE */ -#include "misc.h" +#include /* Need to know how long paths can be... */ #include diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c index a63c092106..e149c3e41e 100755 --- a/hw/xwin/winwindowswm.c +++ b/hw/xwin/winwindowswm.c @@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include "misc.h" +#include #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c index 57142256d2..e70e8507f9 100644 --- a/ilbm/ilbmbres.c +++ b/ilbm/ilbmbres.c @@ -53,7 +53,7 @@ SOFTWARE. to use interleaved bitplanes instead of normal bitplanes */ #include -#include "misc.h" +#include #include "ilbm.h" #include "maskbits.h" #include "miline.h" diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c index 20d078f6a6..aa15fb93bf 100644 --- a/ilbm/ilbmbresd.c +++ b/ilbm/ilbmbresd.c @@ -52,7 +52,7 @@ SOFTWARE. to use interleaved bitplanes instead of normal bitplanes */ #include -#include "misc.h" +#include #include "ilbm.h" #include "maskbits.h" #include "miline.h" diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c index 121174fa2f..16578fcd85 100644 --- a/ilbm/ilbmgetsp.c +++ b/ilbm/ilbmgetsp.c @@ -55,7 +55,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "region.h" #include "gc.h" #include "windowstr.h" diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c index c9aa4c7925..195491a52d 100644 --- a/ilbm/ilbmmisc.c +++ b/ilbm/ilbmmisc.c @@ -52,7 +52,7 @@ SOFTWARE. to use interleaved bitplanes instead of normal bitplanes */ #include -#include "misc.h" +#include #include "cursor.h" #include "scrnintstr.h" diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c index 46bb3a2625..7b4f55a16b 100644 --- a/ilbm/ilbmsetsp.c +++ b/ilbm/ilbmsetsp.c @@ -55,7 +55,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "regionstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/include/closestr.h b/include/closestr.h index d70f754b24..0102a737f5 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -36,7 +36,7 @@ from The Open Group. #include #include "closure.h" #include "dix.h" -#include "misc.h" +#include #include "gcstruct.h" /* closure structures */ diff --git a/include/cursor.h b/include/cursor.h index 512133eb3c..5f9467a2bd 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.2 2004/04/23 19:54:23 eich Exp $ */ /* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */ /*********************************************************** @@ -50,7 +50,7 @@ SOFTWARE. #ifndef CURSOR_H #define CURSOR_H -#include "misc.h" +#include #include "screenint.h" #include "window.h" diff --git a/include/extnsionst.h b/include/extnsionst.h index daf37bf43f..5ed0099580 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H -#include "misc.h" +#include #include "screenint.h" #include "extension.h" #include "gc.h" diff --git a/include/globals.h b/include/globals.h index 2a2a68983a..924608e89b 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.5 2004/09/14 00:51:24 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.6 2005/05/19 18:53:49 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ #ifndef _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index bcaa01e6ff..97adf6fb39 100644 --- a/include/input.h +++ b/include/input.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef INPUT_H #define INPUT_H -#include "misc.h" +#include #include "screenint.h" #include #include diff --git a/include/misc.h b/include/misc.h index 5944a427fd..99f855f7dd 100644 --- a/include/misc.h +++ b/include/misc.h @@ -114,7 +114,7 @@ typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */ typedef struct _xReq *xReqPtr; -#include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ +#include /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ #ifndef IN_MODULE #include /* for bcopy, bzero, and bcmp */ #endif diff --git a/include/miscstruct.h b/include/miscstruct.h index 6a16007b74..0ba871bc07 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 -#include "misc.h" +#include #include #include "gc.h" diff --git a/include/os.h b/include/os.h index 7823b795df..3cd0c4b650 100644 --- a/include/os.h +++ b/include/os.h @@ -51,7 +51,7 @@ SOFTWARE. #ifndef OS_H #define OS_H -#include "misc.h" +#include #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size)) #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr)) #include diff --git a/include/pixmap.h b/include/pixmap.h index 6cea329ece..1777b2407f 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef PIXMAP_H #define PIXMAP_H -#include "misc.h" +#include #include "screenint.h" /* types for Drawable */ diff --git a/include/propertyst.h b/include/propertyst.h index 177fca1716..24eed070e3 100644 --- a/include/propertyst.h +++ b/include/propertyst.h @@ -49,7 +49,7 @@ SOFTWARE. #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H -#include "misc.h" +#include #include "property.h" /* * PROPERTY -- property element diff --git a/include/regionstr.h b/include/regionstr.h index 14995e5f1a..0af87bde85 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.8.2.1 2004/03/30 16:46:23 stukreit Exp $ */ +/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.4 2005/06/25 12:39:58 zack Exp $ */ /* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** diff --git a/include/screenint.h b/include/screenint.h index 1c836952e1..aaa8086fbe 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -49,7 +49,7 @@ SOFTWARE. #ifndef SCREENINT_H #define SCREENINT_H -#include "misc.h" +#include typedef struct _PixmapFormat *PixmapFormatPtr; typedef struct _Visual *VisualPtr; diff --git a/include/servermd.h b/include/servermd.h index 939ff93468..66fe140342 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/include/servermd.h,v 1.4 2005/05/21 07:46:38 alanc Exp $ */ #ifndef SERVERMD_H #define SERVERMD_H 1 diff --git a/include/window.h b/include/window.h index 7c3fce092f..2ffcab370c 100644 --- a/include/window.h +++ b/include/window.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef WINDOW_H #define WINDOW_H -#include "misc.h" +#include #include "region.h" #include "screenint.h" #include diff --git a/iplan2p4/iplbres.c b/iplan2p4/iplbres.c index db92c6bc4c..c3830649e9 100644 --- a/iplan2p4/iplbres.c +++ b/iplan2p4/iplbres.c @@ -52,7 +52,7 @@ SOFTWARE. interleaved planes */ #include -#include "misc.h" +#include #include "ipl.h" #include "servermd.h" #include "miline.h" diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c index dd4afddda1..7ac7b1cdb3 100644 --- a/iplan2p4/iplbresd.c +++ b/iplan2p4/iplbresd.c @@ -52,7 +52,7 @@ SOFTWARE. interleaved planes */ #include -#include "misc.h" +#include #include "ipl.h" #include "miline.h" #include "iplmskbits.h" diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c index 7f742885bf..3478a8051f 100644 --- a/iplan2p4/iplgetsp.c +++ b/iplan2p4/iplgetsp.c @@ -55,7 +55,7 @@ interleaved planes */ #include #include "servermd.h" -#include "misc.h" +#include #include "region.h" #include "gc.h" #include "windowstr.h" diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c index e71222614e..7ad378747b 100644 --- a/iplan2p4/iplsetsp.c +++ b/iplan2p4/iplsetsp.c @@ -55,7 +55,7 @@ interleaved planes */ #include #include "servermd.h" -#include "misc.h" +#include #include "regionstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c index 077a95a6e8..8214136e95 100644 --- a/lbx/lbxcmap.c +++ b/lbx/lbxcmap.c @@ -33,8 +33,8 @@ from The Open Group. #include #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "scrnintstr.h" diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c index ac1d7bc8d1..d3eb0af46a 100644 --- a/lbx/lbxdix.c +++ b/lbx/lbxdix.c @@ -56,8 +56,8 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "inputstr.h" diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c index 433482f4f5..5750ba5b10 100644 --- a/lbx/lbxexts.c +++ b/lbx/lbxexts.c @@ -25,7 +25,7 @@ #include #include -#include "misc.h" +#include #include "dixstruct.h" #include "colormapst.h" #include "propertyst.h" diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c index 8da2fd4eb1..f1c1623b0f 100644 --- a/lbx/lbxgfx.c +++ b/lbx/lbxgfx.c @@ -31,8 +31,8 @@ #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "servermd.h" diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c index ac2de78f20..92958feddc 100644 --- a/lbx/lbxmain.c +++ b/lbx/lbxmain.c @@ -53,8 +53,8 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "scrnintstr.h" diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c index abaf2f3951..619af011aa 100644 --- a/lbx/lbxopts.c +++ b/lbx/lbxopts.c @@ -28,7 +28,7 @@ #endif #include #include -#include "misc.h" +#include #include "colormapst.h" #include "propertyst.h" #include "lbxserve.h" diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c index cdf48f5866..c762353138 100644 --- a/lbx/lbxprop.c +++ b/lbx/lbxprop.c @@ -56,8 +56,8 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "servermd.h" diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c index b27b4a5fb0..4503647663 100644 --- a/lbx/lbxsquish.c +++ b/lbx/lbxsquish.c @@ -52,7 +52,7 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "misc.h" +#include #include "colormapst.h" #include "propertyst.h" #include "lbxserve.h" diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c index 474d12f717..4c571fec9e 100644 --- a/lbx/lbxswap.c +++ b/lbx/lbxswap.c @@ -53,8 +53,8 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c index 0c98731fee..3fb654e38b 100644 --- a/lbx/lbxtags.c +++ b/lbx/lbxtags.c @@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include -#include "misc.h" +#include #include "lbxdata.h" #include "resource.h" #include "colormapst.h" diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index 3723914b6f..21d867d1c9 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include -#include "misc.h" +#include #include "mfb.h" #include "maskbits.h" #include "miline.h" diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index 7a924b7138..fa3b43462e 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ #include -#include "misc.h" +#include #include "mfb.h" #include "maskbits.h" #include "miline.h" diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index 1d67bc55e3..bec9fc6419 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -50,7 +50,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "region.h" #include "gc.h" #include "windowstr.h" diff --git a/mfb/mfbmisc.c b/mfb/mfbmisc.c index 0a4e7f773b..d53dc2f738 100644 --- a/mfb/mfbmisc.c +++ b/mfb/mfbmisc.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ #include -#include "misc.h" +#include #include "cursor.h" #include "scrnintstr.h" diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index 0a97507e0c..f796fd742d 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -51,7 +51,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "regionstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mi/miarc.c b/mi/miarc.c index ee2a038405..0ab98d54ee 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.2 2004/04/23 19:54:26 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.3 2005/04/20 12:25:45 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ /*********************************************************** @@ -60,7 +60,7 @@ SOFTWARE. #endif #include #include -#include "misc.h" +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 5d3a9da700..58a59c8265 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -51,7 +51,7 @@ SOFTWARE. #include #include -#include "misc.h" +#include #include "gcstruct.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/mi/mibstore.c b/mi/mibstore.c index aae3bcfa98..7be84ef824 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -48,7 +48,7 @@ implied warranty. #include #include #include -#include "misc.h" +#include #include "regionstr.h" #include "scrnintstr.h" #include "gcstruct.h" diff --git a/mi/micursor.c b/mi/micursor.c index 5da44c3518..8339e2230f 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -48,7 +48,7 @@ SOFTWARE. /* $Xorg: micursor.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #include "scrnintstr.h" #include "cursor.h" -#include "misc.h" +#include #include "mi.h" extern Bool Must_have_memory; diff --git a/mi/miexpose.c b/mi/miexpose.c index 6ff2afd360..1750de1169 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.2 2004/04/23 19:54:26 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.3 2005/04/20 12:25:45 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ /*********************************************************** @@ -81,7 +81,7 @@ Equipment Corporation. #include #include -#include "misc.h" +#include #include "regionstr.h" #include "scrnintstr.h" #include "gcstruct.h" diff --git a/mi/mifillrct.c b/mi/mifillrct.c index d74aa2466c..efaadae595 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -53,7 +53,7 @@ SOFTWARE. #include "windowstr.h" #include "pixmap.h" #include "mi.h" -#include "misc.h" +#include /* mi rectangles written by newman, with debts to all and sundry diff --git a/mi/miinitext.c b/mi/miinitext.c index db89bc81e6..12d6ddbde2 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.17 2005/04/20 12:25:45 daniels Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.20 2005/05/19 18:53:50 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: miinitext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "misc.h" +#include #include "extension.h" #include "micmap.h" diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index 9a74222236..b596914312 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -50,7 +50,7 @@ SOFTWARE. #include "gc.h" #include "miscanfill.h" #include "mipoly.h" -#include "misc.h" /* MAXINT */ +#include /* MAXINT */ /* * fillUtils.c diff --git a/mi/miscrinit.c b/mi/miscrinit.c index ecf934d544..2bb58b54aa 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -30,7 +30,7 @@ from The Open Group. #include #include "servermd.h" -#include "misc.h" +#include #include "mi.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mi/mispans.c b/mi/mispans.c index 84a737525e..6885af2bed 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -48,7 +48,7 @@ SOFTWARE. /* $Xorg: mispans.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "misc.h" +#include #include "pixmapstr.h" #include "gcstruct.h" #include "mispans.h" diff --git a/mi/mivaltree.c b/mi/mivaltree.c index 415d5a63a7..d9e7117779 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -1,5 +1,5 @@ /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.3 2004/07/31 08:24:14 anholt Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.4 2005/04/20 12:25:45 daniels Exp $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function diff --git a/mi/mizerclip.c b/mi/mizerclip.c index 26335dfb5d..1315fd2446 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ #include -#include "misc.h" +#include #include "scrnintstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mi/mizerline.c b/mi/mizerline.c index d04780aa2b..ad9e17b469 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -48,7 +48,7 @@ SOFTWARE. /* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ #include -#include "misc.h" +#include #include "scrnintstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c index a1c882fcba..0b81528573 100644 --- a/miext/rootless/accel/rlAccel.c +++ b/miext/rootless/accel/rlAccel.c @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/accel/rlAccel.c,v 1.2 2004/10/25 19:09:11 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/miext/rootless/accel/rlAccel.c,v 1.3 2004/12/09 22:40:35 torrey Exp $ */ /* * The accelerated rootless code replaces some GC operations from fb with diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 334ac3f5ef..505db5ad50 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.4 2004/10/08 00:35:08 torrey Exp $ */ /* * Rootless window management */ diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c index e5d728dd8f..1647896bc1 100644 --- a/miext/rootless/safeAlpha/safeAlphaWindow.c +++ b/miext/rootless/safeAlpha/safeAlphaWindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.2 2004/04/23 19:54:28 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.3 2004/12/04 00:43:12 kuhn Exp $ */ /* * Specialized window functions to protect the alpha channel */ diff --git a/os/WaitFor.c b/os/WaitFor.c index 545e1be219..18eacbdba6 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -63,7 +63,7 @@ SOFTWARE. #include #include #include -#include "misc.h" +#include #ifdef __UNIXOS2__ #define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t) diff --git a/os/access.c b/os/access.c index 1b3d96778d..baad02fdaf 100644 --- a/os/access.c +++ b/os/access.c @@ -1,5 +1,5 @@ /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.7 2004/11/15 15:06:50 ago Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.9 2005/05/02 22:01:08 harold Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -67,7 +67,7 @@ SOFTWARE. #include #include #include -#include "misc.h" +#include #include "site.h" #include #include diff --git a/os/connection.c b/os/connection.c index d8c07077b7..45063c8a63 100644 --- a/os/connection.c +++ b/os/connection.c @@ -135,7 +135,7 @@ extern __const__ int _nfiles; #endif #endif #endif /* WIN32 */ -#include "misc.h" /* for typedef of pointer */ +#include /* for typedef of pointer */ #include "osdep.h" #include #include "opaque.h" diff --git a/os/io.c b/os/io.c index 5fa95962f0..4e9f696c62 100644 --- a/os/io.c +++ b/os/io.c @@ -75,12 +75,12 @@ SOFTWARE. #include #define NEED_REPLIES #include -#include "os.h" +#include #include "osdep.h" #include #include "opaque.h" #include "dixstruct.h" -#include "misc.h" +#include #ifdef LBX #include "colormapst.h" #include "propertyst.h" diff --git a/os/k5auth.c b/os/k5auth.c index 876e042221..ebf16c9eb8 100644 --- a/os/k5auth.c +++ b/os/k5auth.c @@ -51,7 +51,7 @@ from The Open Group. #undef xfree #include #include -#include "os.h" +#include #include "osdep.h" #include #include diff --git a/os/lbxio.c b/os/lbxio.c index c44389010e..21724b58c7 100644 --- a/os/lbxio.c +++ b/os/lbxio.c @@ -63,12 +63,12 @@ SOFTWARE. #endif #include #include -#include "os.h" +#include #include #include "osdep.h" #include "opaque.h" #include "dixstruct.h" -#include "misc.h" +#include #include "colormapst.h" #include "propertyst.h" #include "lbxserve.h" diff --git a/os/mitauth.c b/os/mitauth.c index 6ad0c3467e..dfaea35abf 100644 --- a/os/mitauth.c +++ b/os/mitauth.c @@ -34,7 +34,7 @@ from The Open Group. */ #include -#include "os.h" +#include #include "osdep.h" #include "dixstruct.h" diff --git a/os/oscolor.c b/os/oscolor.c index 557d539bb8..bb927c4b60 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -59,7 +59,7 @@ SOFTWARE. #endif #endif #include "rgb.h" -#include "os.h" +#include #include "opaque.h" /* Note that we are assuming there is only one database for all the screens. */ @@ -148,7 +148,7 @@ OsLookupColor(int screen, char *name, unsigned int len, */ #include -#include "os.h" +#include #include "opaque.h" #define HASHSIZE 511 diff --git a/os/osinit.c b/os/osinit.c index 76938ce437..03a017b856 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -49,7 +49,7 @@ SOFTWARE. #include #include -#include "os.h" +#include #include "osdep.h" #include diff --git a/os/rpcauth.c b/os/rpcauth.c index 6b0cf816c2..037a4facf2 100644 --- a/os/rpcauth.c +++ b/os/rpcauth.c @@ -38,8 +38,8 @@ from The Open Group. #include #include "Xauth.h" -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include diff --git a/os/secauth.c b/os/secauth.c index 4daeba1a59..553f50a3ac 100644 --- a/os/secauth.c +++ b/os/secauth.c @@ -27,7 +27,7 @@ from The Open Group. /* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */ #include -#include "os.h" +#include #include "osdep.h" #include "dixstruct.h" #include "swaprep.h" diff --git a/os/utils.c b/os/utils.c index 5242960f3a..a94c294814 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.12 2005/03/23 19:58:45 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.17 2005/06/09 02:29:42 ajax Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* @@ -62,7 +62,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #include #include -#include "misc.h" +#include #include #include #include "input.h" diff --git a/os/xalloc.c b/os/xalloc.c index ad606b2a2d..f257cf41cc 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -36,7 +36,7 @@ Pascal Haible. #include /* for malloc() etc. */ #include -#include "misc.h" +#include #include #ifdef XALLOC_LOG diff --git a/os/xdmauth.c b/os/xdmauth.c index 1468dfeb79..9c8bc2cdbc 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -38,7 +38,7 @@ from The Open Group. #include #include #include -#include "os.h" +#include #include "osdep.h" #include "dixstruct.h" diff --git a/os/xdmcp.c b/os/xdmcp.c index f253c24958..f90536b5fe 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.5 2005/04/20 12:25:47 daniels Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.7 2005/05/02 21:57:32 harold Exp $ */ /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. @@ -37,7 +37,7 @@ #include #include #include -#include "misc.h" +#include #include #include "osdep.h" #include "input.h" diff --git a/os/xprintf.c b/os/xprintf.c index cb9f1460a8..70051f26f2 100644 --- a/os/xprintf.c +++ b/os/xprintf.c @@ -27,7 +27,7 @@ * use or other dealings in this Software without prior written authorization. */ #include -#include "os.h" +#include #include #include diff --git a/randr/randr.c b/randr/randr.c index cdb81a6d58..db9c576017 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -29,8 +29,8 @@ #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "scrnintstr.h" diff --git a/record/record.c b/record/record.c index d206172002..55ae6934cd 100644 --- a/record/record.c +++ b/record/record.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.2 2004/04/23 19:54:28 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.3 2005/04/20 12:25:47 daniels Exp $ */ /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* diff --git a/record/set.c b/record/set.c index 3415166642..a239e4af02 100644 --- a/record/set.c +++ b/record/set.c @@ -52,7 +52,7 @@ from The Open Group. */ #ifndef TESTING -#include "misc.h" +#include #else #include #include diff --git a/render/filter.c b/render/filter.c index 935c915150..5bd4efd565 100644 --- a/render/filter.c +++ b/render/filter.c @@ -25,9 +25,9 @@ #ifdef HAVE_CONFIG_H #include #endif -#include "misc.h" +#include #include "scrnintstr.h" -#include "os.h" +#include #include "regionstr.h" #include "validate.h" #include "windowstr.h" diff --git a/render/glyph.c b/render/glyph.c index 75a75f4348..e224eab85a 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -23,9 +23,9 @@ * Author: Keith Packard, SuSE, Inc. */ -#include "misc.h" +#include #include "scrnintstr.h" -#include "os.h" +#include #include "regionstr.h" #include "validate.h" #include "windowstr.h" diff --git a/render/picture.c b/render/picture.c index b10b8c4d03..48faa9b243 100644 --- a/render/picture.c +++ b/render/picture.c @@ -26,9 +26,9 @@ #ifdef HAVE_CONFIG_H #include #endif -#include "misc.h" +#include #include "scrnintstr.h" -#include "os.h" +#include #include "regionstr.h" #include "validate.h" #include "windowstr.h" diff --git a/render/render.c b/render/render.c index 1d1506d8bb..6451ab803c 100644 --- a/render/render.c +++ b/render/render.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.6 2004/12/04 00:43:13 kuhn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.8 2005/07/01 10:05:43 lars Exp $ */ /* * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ * @@ -28,8 +28,8 @@ #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "resource.h" #include "scrnintstr.h" diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h index 83edfa1b47..05ab77d3f6 100755 --- a/xfixes/xfixesint.h +++ b/xfixes/xfixesint.h @@ -28,8 +28,8 @@ #define NEED_EVENTS #include #include -#include "misc.h" -#include "os.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c index 70c10e202b..c5e32d0b78 100644 --- a/xkb/ddxConfig.c +++ b/xkb/ddxConfig.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "os.h" +#include #define XKBSRV_NEED_FILE_FUNCS #include #include diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index cfadb2d627..93b58bd04f 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.3 2005/04/20 12:25:48 daniels Exp $ */ /* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/xkb/xkb.c b/xkb/xkb.c index ce3164c109..ee478a3658 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES #include -#include "misc.h" +#include #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS #include diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index f45dd818ff..9198825dfd 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -1,5 +1,5 @@ /* $Xorg: xkbActions.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/xkb/xkbActions.c,v 1.4 2005/05/22 01:12:49 alanc Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include "misc.h" +#include #include "inputstr.h" #include #include "xkb.h" diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 506b5458e2..35f9415d1e 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -1,5 +1,5 @@ /* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XdotOrg: xc/programs/Xserver/xkb/xkbInit.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/xkb/xkbInit.c,v 1.3 2005/04/20 12:25:48 daniels Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -37,7 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include "misc.h" +#include #include "inputstr.h" #include "opaque.h" #include "property.h" diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 7cdd21ae37..212048ac8d 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS 1 #include #include -#include "misc.h" +#include #include "inputstr.h" #include diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 175f7ff225..71cc3e403a 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include "misc.h" +#include #include "inputstr.h" #include #include diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index 08af172b70..1e2773f645 100644 --- a/xkb/xkbPrOtherEv.c +++ b/xkb/xkbPrOtherEv.c @@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include "misc.h" +#include #include "inputstr.h" #include diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index 520885515f..6353294458 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.c @@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES #include -#include "misc.h" +#include #include "inputstr.h" #include #include diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 61585ebdb3..c4ff1ca3fc 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #define XK_CYRILLIC #include -#include "misc.h" +#include #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS