diff options
Diffstat (limited to 'hw/xfree86/common')
37 files changed, 88 insertions, 88 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 099ff3482..7c3db0262 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -34,7 +34,7 @@ #include <ctype.h> #include <stdlib.h> #include <unistd.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index f38b2dc94..0b0ecf6bf 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.4 2004/08/09 02:08:35 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.6 2004/12/06 21:54:19 herrb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ @@ -71,7 +71,7 @@ extern DeviceAssocRec mouse_assoc; #ifdef XKB #define XKB_IN_SERVER -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif #ifdef RENDER diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 1a5fa4620..669c2f853 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -30,8 +30,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "os.h" #ifdef XFree86LOADER #include "loaderProcs.h" diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 51015e1f4..f5f969060 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -29,8 +29,8 @@ /* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */ #define NEED_EVENTS -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "input.h" #include "cursor.h" #include "mipointer.h" @@ -44,7 +44,7 @@ #include "xf86_OSproc.h" #ifdef XINPUT -#include "XIproto.h" +#include <X11/extensions/XIproto.h> #include "xf86Xinput.h" #endif diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index bb63cca0e..dfe397a63 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.2 2004/04/23 19:20:32 eich 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. @@ -33,7 +33,7 @@ #include "xf86str.h" #include "xf86Priv.h" #include "dgaproc.h" -#include "xf86dgastr.h" +#include <X11/extensions/xf86dgastr.h> #include "colormapst.h" #include "pixmapstr.h" #include "inputstr.h" @@ -41,7 +41,7 @@ #include "servermd.h" #include "micmap.h" #ifdef XKB -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif #include "xf86Xinput.h" diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 104e64cfc..f6df8d722 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: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.4 2004/09/22 17:20:56 alanc Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -32,14 +32,14 @@ * This file contains the DPMS functions required by the extension. */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "globals.h" #include "xf86.h" #include "xf86Priv.h" #ifdef DPMSExtension #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> #include "dpmsproc.h" #endif diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index 3bf21689f..34be37534 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -33,7 +33,7 @@ #include <sys/time.h> #include <unistd.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c index 560ab2e9d..adfddacb1 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -33,8 +33,8 @@ #include <ctype.h> #include <stdlib.h> -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "os.h" #ifdef XFree86LOADER #include "loaderProcs.h" diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index 8938c1d96..3f56487b3 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -33,8 +33,8 @@ #include <ctype.h> #include <stdlib.h> -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "os.h" #ifdef XFree86LOADER #include "loaderProcs.h" diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index dd38eecf4..e0f9762da 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.6 2005/01/28 16:12:58 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.7 2005/03/05 20:47:12 gisburn Exp $ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ @@ -57,9 +57,9 @@ #define I_NEED_OS2_H #endif -#include "X.h" -#include "Xpoll.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xpoll.h> +#include <X11/Xproto.h> #include "misc.h" #include "compiler.h" @@ -76,8 +76,8 @@ #endif #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #else #include "inputstr.h" #endif @@ -97,7 +97,7 @@ extern Bool noXkbExtension; #ifdef DPMSExtension #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> #include "dpmsproc.h" #endif @@ -119,7 +119,7 @@ extern Bool noXkbExtension; #ifdef XTESTEXT1 #define XTestSERVER_SIDE -#include "xtestext1.h" +#include <X11/extensions/xtestext1.h> extern short xtest_mousex; extern short xtest_mousey; extern int on_steal_input; diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index bb6b9664f..1ab71400c 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -31,7 +31,7 @@ * This file contains all the XFree86 global variables. */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "windowstr.h" #include "propertyst.h" diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 61d1a1271..e522ceebe 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -36,7 +36,7 @@ * different drivers. */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "servermd.h" #include "pixmapstr.h" diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index a32536fe8..5db7f1a36 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -44,10 +44,10 @@ #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" -#include "Xatom.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> +#include <X11/Xatom.h> #include "input.h" #include "servermd.h" #include "windowstr.h" @@ -74,8 +74,8 @@ #include "xf86Build.h" #include "mipointer.h" #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #else #include "inputstr.h" #endif @@ -95,7 +95,7 @@ extern int xtest_command_key; #ifdef DPMSExtension #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> #include "dpmsproc.h" #endif diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index b26f5b2e3..dc1ce735f 100644 --- a/hw/xfree86/common/xf86Io.c +++ b/hw/xfree86/common/xf86Io.c @@ -49,11 +49,11 @@ */ /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */ -/* $XdotOrg:$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 1.2 2004/07/28 03:57:19 alanc Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "inputstr.h" #include "scrnintstr.h" @@ -67,7 +67,7 @@ #ifdef XINPUT #include "xf86Xinput.h" -#include "XIproto.h" +#include <X11/extensions/XIproto.h> #include "exevents.h" #endif diff --git a/hw/xfree86/common/xf86Kbd.c b/hw/xfree86/common/xf86Kbd.c index 3c7ed7a69..e1bbe8388 100644 --- a/hw/xfree86/common/xf86Kbd.c +++ b/hw/xfree86/common/xf86Kbd.c @@ -54,8 +54,8 @@ #define I_NEED_OS2_H #endif -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/common/xf86KbdBSD.c b/hw/xfree86/common/xf86KbdBSD.c index 2621e2a81..3c6c0eece 100644 --- a/hw/xfree86/common/xf86KbdBSD.c +++ b/hw/xfree86/common/xf86KbdBSD.c @@ -51,8 +51,8 @@ /* $XConsortium: xf86KbdBSD.c /main/6 1996/10/23 13:12:27 kaleb $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/common/xf86KbdLnx.c b/hw/xfree86/common/xf86KbdLnx.c index b023acfbd..f6e9200c9 100644 --- a/hw/xfree86/common/xf86KbdLnx.c +++ b/hw/xfree86/common/xf86KbdLnx.c @@ -57,8 +57,8 @@ /* $XConsortium: xf86KbdLnx.c /main/7 1996/10/19 17:59:00 kaleb $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index 3b7551fc5..0dc4b6fca 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -37,8 +37,8 @@ */ /* $XConsortium: xf86KbdMach.c /main/9 1996/02/21 17:38:43 kaleb $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index a36ca52f2..198b24d22 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -35,14 +35,14 @@ #define I_NEED_OS2_H #endif -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" #ifdef XF86MISC #define _XF86MISC_SERVER_ -#include "xf86misc.h" +#include <X11/extensions/xf86misc.h> #include "xf86miscproc.h" #endif @@ -50,8 +50,8 @@ #include "xf86_OSlib.h" #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "xf86Xinput.h" #else #include "inputstr.h" diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 470fb7c95..cfe1bd4a5 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.2 2004/04/23 19:20:32 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. @@ -36,7 +36,7 @@ * This file includes helper functions for mode related things. */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "servermd.h" #include "mibank.h" diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 0ba09b507..eeef61d68 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <ctype.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index 13adc6f06..a307bebb0 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -26,7 +26,7 @@ * authorization from the copyright holder(s) and author(s). */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index f69faec96..bbbb80cba 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.7 2005/01/28 16:12:59 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2005/03/16 12:16:06 eich Exp $ */ /* * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * @@ -23,7 +23,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "mibank.h" #include "globals.h" diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 467270e10..525ab04c9 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -35,7 +35,7 @@ * maintained. */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86XKB.c b/hw/xfree86/common/xf86XKB.c index e1755de1e..ab13ebd0f 100644 --- a/hw/xfree86/common/xf86XKB.c +++ b/hw/xfree86/common/xf86XKB.c @@ -61,7 +61,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XI.h" +#include <X11/extensions/XI.h> #include "compiler.h" @@ -70,7 +70,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XF86_OS_PRIVS #include "xf86_OSlib.h" -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> void xf86InitXkb(void) diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 6b06fd61e..833cbcdbb 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -48,13 +48,13 @@ * authorization from the copyright holder(s) and author(s). */ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 1.3 2005/01/19 22:23:20 alanc Exp $ */ -#include "Xfuncproto.h" -#include "Xmd.h" +#include <X11/Xfuncproto.h> +#include <X11/Xmd.h> #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #endif #include "xf86.h" #include "xf86Priv.h" @@ -67,7 +67,7 @@ #ifdef DPMSExtension #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> #include "dpmsproc.h" #endif @@ -87,7 +87,7 @@ #include <stdarg.h> #include "osdep.h" /* EnabledDevices */ -#include "Xpoll.h" +#include <X11/Xpoll.h> #include "xf86_OSproc.h" /* sigio stuff */ /****************************************************************************** diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 9a0393447..0c20f78fe 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -60,8 +60,8 @@ #include "xf86str.h" #include "inputstr.h" #ifdef XINPUT -#include "extensions/XI.h" -#include "extensions/XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #endif diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index e2070481c..2b1d21ec1 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.3 2004/07/30 21:10:46 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.4 2004/12/04 00:42:52 kuhn 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. @@ -36,9 +36,9 @@ #undef _XOPEN_SOURCE #endif -#include "X.h" +#include <X11/X.h> #include "misc.h" -#include "Xproto.h" +#include <X11/Xproto.h> #include "colormapst.h" #include "scrnintstr.h" @@ -51,7 +51,7 @@ #ifdef XFreeXDGA #define _XF86DGA_SERVER_ -#include "extensions/xf86dgastr.h" +#include <X11/extensions/xf86dgastr.h> #include "dgaproc.h" #endif diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 8a807624f..03722b750 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -34,7 +34,7 @@ #include <ctype.h> #include <stdlib.h> #include <unistd.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index ee286d172..60b9595fc 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -30,7 +30,7 @@ #include "misc.h" #include "xf86.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "regionstr.h" #include "xf86fbman.h" diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index 1b9890d5e..b9d7386ec 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -34,7 +34,7 @@ #include <ctype.h> #include <stdlib.h> #include <unistd.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 2d79ab476..7be4a510b 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -34,7 +34,7 @@ #include <ctype.h> #include <stdlib.h> #include <unistd.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 85f57e96f..b81c91759 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -34,7 +34,7 @@ #include <ctype.h> #include <stdlib.h> #include <unistd.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "Pci.h" #include "xf86.h" diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 801f2bafe..cd354e777 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -25,7 +25,7 @@ #include <ctype.h> #include <stdio.h> #include <unistd.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index db19e1442..43e849f2a 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -34,8 +34,8 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "regionstr.h" #include "windowstr.h" @@ -46,8 +46,8 @@ #include "gcstruct.h" #include "dixstruct.h" -#include "Xv.h" -#include "Xvproto.h" +#include <X11/extensions/Xv.h> +#include <X11/extensions/Xvproto.h> #include "xvdix.h" #ifdef XFree86LOADER #include "xvmodproc.h" diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index 832861ea4..d74214a2f 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -31,8 +31,8 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index c6364f19e..370143c3d 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -1,6 +1,6 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.2 2004/04/23 19:20:32 eich Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "servermd.h" #include "pixmapstr.h" |