diff options
Diffstat (limited to 'hw/xfree86')
156 files changed, 205 insertions, 183 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 9abd81ee8..903f61c28 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <unistd.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 362886a02..269923c29 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 669c2f853..d35f0c8d7 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -32,7 +32,7 @@ #include <fcntl.h> #include <X11/X.h> #include <X11/Xmd.h> -#include "os.h" +#include <X11/os.h> #ifdef XFree86LOADER #include "loaderProcs.h" #endif diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index dfe397a63..3d9bdfe22 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 f6df8d722..50a3e66d2 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "globals.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index 6ac9c21ba..15aafb817 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 34be37534..76b69d79b 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -34,7 +34,7 @@ #include <sys/time.h> #include <unistd.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 adfddacb1..f34d19a32 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <X11/X.h> #include <X11/Xmd.h> -#include "os.h" +#include <X11/os.h> #ifdef XFree86LOADER #include "loaderProcs.h" #include "xf86Config.h" diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index 3f56487b3..fe07d2875 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <X11/X.h> #include <X11/Xmd.h> -#include "os.h" +#include <X11/os.h> #ifdef XFree86LOADER #include "loaderProcs.h" #endif diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 2e9b3f173..14d653f1a 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 <X11/X.h> #include <X11/Xpoll.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #include "compiler.h" diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 1ab71400c..653b4433c 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -32,7 +32,7 @@ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "windowstr.h" #include "propertyst.h" #include "xf86.h" diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index e522ceebe..50466697b 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -37,7 +37,7 @@ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "servermd.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index dc1ce735f..338e28297 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 <X11/X.h> diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index 198b24d22..d59bea0c8 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -36,7 +36,7 @@ #endif #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index a6bf550ae..6209290df 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "servermd.h" #include "mibank.h" #include "globals.h" diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index f0ac3bd59..7f4179cc3 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 <X11/misc.h> #include "xf86Version.h" #ifndef NULL #define NULL ((void *)0) diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index eeef61d68..ae131aa7c 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <ctype.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Xinput.h" #include "xf86Optrec.h" diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index bbbb80cba..7c77777e4 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "mibank.h" #include "globals.h" #include "xf86.h" diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index d40fcdaed..45746bc90 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 525ab04c9..1b2b63bbf 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -36,7 +36,7 @@ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 833cbcdbb..e9f9fae3e 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 <X11/Xfuncproto.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index 2b1d21ec1..e27dceee9 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 <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #include <X11/Xproto.h> #include "colormapst.h" #include "scrnintstr.h" diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 03722b750..0d448e27b 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <unistd.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index 60b9595fc..fef4d633c 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 <X11/misc.h> #include "xf86.h" #include <X11/X.h> diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index b9d7386ec..56a79ac23 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <unistd.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 7be4a510b..904de01d6 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <unistd.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Resources.h" diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index ee22056d6..da732e0a5 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <unistd.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "Pci.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index cd354e777..5b747e248 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <unistd.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 a90b5483d..67052b220 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 <X11/misc.h> #include "input.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 43e849f2a..79cda35c5 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 <X11/misc.h> #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index d74214a2f..f6d0aaf39 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 <X11/misc.h> #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index 370143c3d..af729a01f 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "servermd.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index e89cc39c1..47005320a 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 c4cc3c624..577e8169a 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 <X11/misc.h> #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 58616d308..b17363648 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -7,7 +7,7 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ -#include "misc.h" +#include <X11/misc.h> #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 36bb10cda..a2437a4ba 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -4,7 +4,7 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ -#include "misc.h" +#include <X11/misc.h> #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 8af7702d8..391f220cd 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -4,7 +4,7 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ -#include "misc.h" +#include <X11/misc.h> #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 caea5caa1..8329e129a 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 <X11/misc.h> #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 2cdeacab5..3490fd533 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -4,7 +4,7 @@ * * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ -#include "misc.h" +#include <X11/misc.h> #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 b0f239936..cb58e7fb9 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 928ae9fd2..efa7d1b40 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 <X11/X.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #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 deb1b11e5..7224a5eee 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -10,7 +10,7 @@ #define NEED_EVENTS #include <X11/X.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #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 4f263ce20..e5ce56fc4 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -10,7 +10,7 @@ #define NEED_EVENTS #include <X11/X.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #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 464ba23dc..99de107c4 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 <X11/X.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #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 7466e9a4f..0ffca8397 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 <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #include "scrnintstr.h" #include "gc.h" #include <X11/extensions/Xv.h> diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 13f27bf64..094703bc0 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 <X11/X.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index bb7a89ee0..1fa7a8edc 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 31fb1d748..3df025b0a 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 <X11/X.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #include "dixstruct.h" #include "extnsionst.h" #include "colormapst.h" diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index cd7942a62..e754a2013 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index 51ea1bab5..862f85b4e 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index f5a9e414e..0ff83881b 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index 3a18e5eb8..59424f20f 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index 3e25c5aac..90283ccb3 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index b7a7f1cc4..383fa08a0 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 7c1fb3497..934f016df 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index fd912f681..090827a05 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index 106ab2116..8089a46da 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index d2140d609..9fbe347e6 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index a197cc49c..3dc3264c3 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index 1b08c3dc7..b417d3007 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index 47baa655c..8a48b5245 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index 261739268..9d0f6ecd7 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index fe00d5b7d..6a0e38239 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index 31c6b2749..9296cc72f 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index 56ca5a986..349443c9c 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index d2aab860c..0530e3b7a 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 1959609dc..148b8fb7e 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index c5aa5098b..297606fc5 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c index aa7d62dc5..fb243f8b5 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 <X11/foo.h>. * * ************************************************************************************/ diff --git a/hw/xfree86/i2c/uda1380.h b/hw/xfree86/i2c/uda1380.h index 9254ff6f9..a376b4038 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 <X11/foo.h>. * * ************************************************************************************/ diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index f6988842f..4253d8075 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 <X11/misc.h> #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 971c58ca3..a79375abc 100644 --- a/hw/xfree86/loader/aoutloader.c +++ b/hw/xfree86/loader/aoutloader.c @@ -45,7 +45,7 @@ #endif #include <X11/Xos.h> -#include "os.h" +#include <X11/os.h> #include "aout.h" #include "sym.h" diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c index c7442b3fa..366bf6eaf 100644 --- a/hw/xfree86/loader/coffloader.c +++ b/hw/xfree86/loader/coffloader.c @@ -40,7 +40,7 @@ #endif #include <X11/Xos.h> -#include "os.h" +#include <X11/os.h> #include "coff.h" #include "sym.h" diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 3a614a956..b1997cd40 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 <X11/misc.h> #include "globals.h" -#include "os.h" +#include <X11/os.h> #include "osdep.h" #include "resource.h" #include "servermd.h" diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index 7527b5dd7..a089ba548 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -30,7 +30,7 @@ #include <dlfcn.h> #include <X11/Xos.h> -#include "os.h" +#include <X11/os.h> #include "sym.h" #include "loader.h" diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index fd51e7cef..173695006 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 <X11/Xos.h> -#include "os.h" +#include <X11/os.h> #include "elf.h" #include "sym.h" diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c index 11fb50472..f53da6e3a 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 <X11/misc.h> #ifdef PANORAMIX #include "panoramiX.h" #endif diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index 12f3c63b4..d424f0461 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 <X11/os.h> #include <X11/Xos.h> #undef abs #include <stdlib.h> diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 8703e48db..4e4729526 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 <X11/os.h> #include "sym.h" #include "loader.h" #include "loaderProcs.h" diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index ffc98b243..705460eb9 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 <X11/misc.h> #include "xf86.h" ExtensionModule *ExtensionModuleList = NULL; diff --git a/hw/xfree86/loader/loadfont.c b/hw/xfree86/loader/loadfont.c index 6886692da..69a16ac80 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 <X11/misc.h> #include "xf86.h" FontModule *FontModuleList = NULL; diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 148073cf9..b3c9f736b 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 <X11/os.h> /* For stat() and related stuff */ #define NO_OSLIB_PROTOTYPES #include "xf86_OSlib.h" #define LOADERDECLARATIONS #include "loaderProcs.h" -#include "misc.h" +#include <X11/misc.h> #include "xf86.h" #include "xf86Priv.h" #ifdef XINPUT diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c index 33eb6d3f3..5977546b8 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 <X11/misc.h> #include "mi.h" #include "mibank.h" #include "miwideline.h" diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 12c3a07e6..ee71f4ff8 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -54,7 +54,7 @@ #include <fcntl.h> #include <setjmp.h> #include "sym.h" -#include "misc.h" +#include <X11/misc.h> #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 af2138e26..ef442b4f7 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 bed119fe2..77a2a79a8 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 7f24124dc..71bc91687 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 <dawes@XFree86.org> */ -/* $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 <sys/types.h> #include <unistd.h> @@ -33,7 +33,7 @@ #include <fcntl.h> #ifdef XFree86LOADER -#include "misc.h" +#include <X11/misc.h> #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 e0e30bc03..07cc55f54 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 a8b7ef492..d1284dc44 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 <X11/Xarch.h> #include <X11/Xfuncproto.h> -#include "misc.h" +#include <X11/misc.h> #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 9ce6f3883..44dcb1198 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 c96e7a118..d408d1623 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 1a4442547..0bd33aea7 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 <obz@Kodak.com> diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 25404b02b..6b5bfa999 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 7889617e3..a94ad34cc 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 <dwex@goblin.org> * @@ -38,7 +38,7 @@ int _xf86misc; /* For use only with gcc */ #ifdef __GNUC__ -#include "os.h" +#include <X11/os.h> 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 64d2de967..66d15b261 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -46,7 +46,7 @@ #include <stdarg.h> #include <fcntl.h> #include <X11/Xfuncproto.h> -#include "os.h" +#include <X11/os.h> #include <ctype.h> #include <unistd.h> #include <string.h> diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index 5e8efe330..4225e6dd4 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 6c78cf71a..358981f10 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 8942bdcb3..09d63ec26 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 9e5886c28..126415e6e 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 358a44f35..97c6dba39 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 7e4998817..56929d69b 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 1e37c4f27..eba420937 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 4c8f63e8b..b3fedbd0f 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 a38575d62..b65420e2b 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 86a9b4179..9bae4ba69 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 <X11/misc.h> #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 eb3a1dfda..5f0f78f02 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 72a4d5942..3fa3ee911 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 <X11/misc.h> #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 783d79b93..68adaa31a 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 <X11/misc.h> #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 ce7938a68..675fce09c 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 <X11/misc.h> #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 7a67ee0fd..4a82e6511 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Pci.h" diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 0c441cb1c..960aa8af7 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -10,7 +10,7 @@ #include <X11/X.h> #include <X11/Xproto.h> -#include "misc.h" +#include <X11/misc.h> #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 28495013f..fbc620709 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 a7c6a3263..f11922ece 100644 --- a/hw/xfree86/utils/pcitweak/pcitweak.c +++ b/hw/xfree86/utils/pcitweak/pcitweak.c @@ -33,7 +33,7 @@ */ #include <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 4ed4a1108..b1378ff59 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 <X11/X.h> -#include "os.h" +#include <X11/os.h> #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 60f1176c1..6fe59a1f1 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 <pcpa@conectiva.com.br> * - * $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 509b74e76..29c1c0e2b 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 cc6dc4664..86580a742 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 <stdlib.h> #include <stdio.h> diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index e1ee6f27c..fb0e65b7e 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -13,7 +13,7 @@ #define _NEED_SYSI86 #include <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index c200aee9a..14dbb4be3 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -15,7 +15,7 @@ #define _VGAHW_H #include <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #include "input.h" #include "scrnintstr.h" #include "colormapst.h" diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 36e3a3800..5e2965ca9 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 <X11/misc.h> #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 a13060178..5bf4c9858 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 <X11/misc.h> #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 611acc502..b614a8afb 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -10,7 +10,7 @@ */ -#include "misc.h" +#include <X11/misc.h> #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 24e8c907f..13b1a6d05 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 <X11/misc.h> #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 a9660d3ec..de9bd2b92 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 <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #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 d59dc4dba..fe73aef62 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 <X11/misc.h> #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 a7945b068..699491f66 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 <X11/misc.h> #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 fcd8783c8..0cf273c5b 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -31,7 +31,7 @@ */ -#include "misc.h" +#include <X11/misc.h> #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 89d6756fb..b7178b9af 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 <X11/misc.h> #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 945c2e6ef..207a12668 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 <X11/misc.h> #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 acd56c344..d7e6d4d52 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 <X11/misc.h> #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 9af3aeec1..6faa7685e 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 <X11/misc.h> #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 822662e39..090436b9b 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 <X11/misc.h> #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 9378bcf6c..a17b152da 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 <X11/misc.h> #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 b40ad4aea..2f9bdb759 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 <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #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 f63dc9ff7..4c9b01018 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 <X11/misc.h> #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 9e6f61f6f..4882f76a6 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -18,7 +18,7 @@ ********************************************************************/ -#include "misc.h" +#include <X11/misc.h> #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 e99f9c34c..53d0eb841 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -7,7 +7,7 @@ */ -#include "misc.h" +#include <X11/misc.h> #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 967bb1993..044e727ee 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 <X11/misc.h> #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 dbd2357c2..7f5923e42 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 <X11/misc.h> #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 9d2622e95..718a99275 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 <X11/misc.h> #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 887fa1acc..abe1bbb07 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 <X11/misc.h> #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 c84a59d83..a80388eae 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 <X11/misc.h> #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 29b6d764a..0f39db96d 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,7 +1,7 @@ /* $XFree86$ */ #include <X11/X.h> -#include "misc.h" +#include <X11/misc.h> #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 d39ca834b..8a7d73a33 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 <X11/misc.h> #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 3facb7af8..113be1536 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 <X11/misc.h> #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 ca7c3fb7b..a78ed3758 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 <X11/misc.h> #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 432cef4b2..a4298ddda 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -18,7 +18,7 @@ ********************************************************************/ -#include "misc.h" +#include <X11/misc.h> #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 29faa1ab0..866464854 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 <X11/misc.h> #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 9b5ea57ea..9c99b1c85 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 <X11/misc.h> #include "xf86_ansic.h" #include "compiler.h" diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index 345492c59..f9642c0d4 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 <X11/misc.h> /* 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 b517769d9..06af87b57 100644 --- a/hw/xfree86/xf8_16bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c @@ -8,7 +8,7 @@ #include <X11/X.h> #include <X11/Xmd.h> -#include "misc.h" +#include <X11/misc.h> #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 0fcd18843..1088a10f9 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 <X11/X.h> diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index f67a7093c..19b13939b 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -3,7 +3,7 @@ #include <X11/X.h> #include <X11/Xmd.h> -#include "misc.h" +#include <X11/misc.h> #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 71dddafe6..a45804e2e 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 <X11/misc.h> #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 8ee2a0e43..ca4322e1a 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -11,7 +11,7 @@ #include <X11/X.h> #include <X11/Xmd.h> -#include "misc.h" +#include <X11/misc.h> #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 669ef9f63..832581093 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -2,7 +2,7 @@ #include <X11/X.h> #include <X11/Xmd.h> -#include "misc.h" +#include <X11/misc.h> #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" |