diff options
Diffstat (limited to 'hw/xfree86/common')
33 files changed, 41 insertions, 41 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 $ */ |