diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-04-20 12:25:48 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-04-20 12:25:48 +0000 |
| commit | 292c4cff26687e6ef86c285b97813ab587daf009 (patch) | |
| tree | b12025c2277345526ba7abd97222be0670e28198 /hw | |
| parent | c062d7f96f47bdd31640be1fbce682d0774db3d9 (diff) | |
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
Diffstat (limited to 'hw')
276 files changed, 708 insertions, 534 deletions
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index 86e27c2bc..e6fb781d0 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -29,11 +29,11 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.4 2004/08/11 23:53:36 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.5 2004/09/22 23:38:32 torrey Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "os.h" #include "servermd.h" #include "inputstr.h" @@ -49,8 +49,8 @@ #include "dix.h" #ifdef XINPUT -# include "XI.h" -# include "XIproto.h" +# include <X11/extensions/XI.h> +# include <X11/extensions/XIproto.h> # include "exevents.h" # include "extinit.h" #endif diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h index 337706b3f..4f4e9b91f 100644 --- a/hw/darwin/darwin.h +++ b/hw/darwin/darwin.h @@ -31,7 +31,7 @@ #include <IOKit/IOTypes.h> #include "inputstr.h" #include "scrnintstr.h" -#include "extensions/XKB.h" +#include <X11/extensions/XKB.h> typedef struct { void *framebuffer; diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c index 6bfda00d4..61100d9b3 100644 --- a/hw/darwin/darwinEvents.c +++ b/hw/darwin/darwinEvents.c @@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.6 2004/03/31 22:29:09 torrey Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "misc.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/hw/darwin/darwinXinput.c b/hw/darwin/darwinXinput.c index aab10981c..d3716a1d4 100644 --- a/hw/darwin/darwinXinput.c +++ b/hw/darwin/darwinXinput.c @@ -55,11 +55,11 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/hw/darwin/darwinXinput.c,v 1.1 2004/05/28 07:44:00 torrey Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "inputstr.h" -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" /*********************************************************************** diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index fc43cf8a5..bcc430e58 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -33,11 +33,11 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2004/04/23 19:15:17 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2004/07/30 17:37:09 torrey Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "os.h" #include "servermd.h" #include "inputstr.h" diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h index 1e03cdf80..288063da1 100644 --- a/hw/darwin/iokit/xfIOKit.h +++ b/hw/darwin/iokit/xfIOKit.h @@ -35,7 +35,7 @@ #include <pthread.h> #include <IOKit/graphics/IOFramebufferShared.h> -#include "X11/Xproto.h" +#include <X11/Xproto.h> #include "screenint.h" #include "darwin.h" diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h index 707c24029..ec8ec7d49 100644 --- a/hw/darwin/quartz/XServer.h +++ b/hw/darwin/quartz/XServer.h @@ -29,11 +29,11 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.2 2004/04/23 19:15:17 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */ #define BOOL xBOOL -#include "Xproto.h" +#include <X11/Xproto.h> #undef BOOL #import <Cocoa/Cocoa.h> diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index 040b57680..d79df4cee 100644 --- a/hw/darwin/quartz/applewm.c +++ b/hw/darwin/quartz/applewm.c @@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "servermd.h" #include "swaprep.h" #include "propertyst.h" -#include "Xatom.h" +#include <X11/Xatom.h> #include "darwin.h" #define _APPLEWM_SERVER_ #include "applewmstr.h" diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c index 9f71eae89..71093f5fb 100644 --- a/hw/darwin/quartz/pseudoramiX.c +++ b/hw/darwin/quartz/pseudoramiX.c @@ -39,7 +39,7 @@ Equipment Corporation. #include "extnsionst.h" #include "dixstruct.h" #include "window.h" -#include "panoramiXproto.h" +#include <X11/extensions/panoramiXproto.h> #include "globals.h" extern int ProcPanoramiXQueryVersion (ClientPtr client); diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c index 15df9e07b..2106dfad4 100644 --- a/hw/darwin/quartz/quartzAudio.c +++ b/hw/darwin/quartz/quartzAudio.c @@ -44,7 +44,7 @@ #include <pthread.h> #include "inputstr.h" -#include "extensions/XI.h" +#include <X11/extensions/XI.h> void NSBeep(); diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c index e9f9d6698..536dcc336 100644 --- a/hw/darwin/quartz/quartzPasteboard.c +++ b/hw/darwin/quartz/quartzPasteboard.c @@ -33,7 +33,7 @@ #include "quartzPasteboard.h" -#include "Xatom.h" +#include <X11/Xatom.h> #include "windowstr.h" #include "propertyst.h" #include "scrnintstr.h" diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index 0eba61cb2..d4cd27b8f 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -38,8 +38,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index 25934c746..e8e49f965 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -45,8 +45,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h index 1951e7dcb..f826167f6 100644 --- a/hw/darwin/quartz/xpr/dri.h +++ b/hw/darwin/quartz/xpr/dri.h @@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _DRI_H_ #define _DRI_H_ -#include "Xdefs.h" +#include <X11/Xdefs.h> #include "scrnintstr.h" #define _APPLEDRI_SERVER_ #include "appledri.h" diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c index a5186d5f6..2db6a2432 100644 --- a/hw/darwin/quartz/xpr/xprAppleWM.c +++ b/hw/darwin/quartz/xpr/xprAppleWM.c @@ -33,7 +33,7 @@ #include "applewmExt.h" #include "rootless.h" #include "Xplugin.h" -#include "X.h" +#include <X11/X.h> static int xprSetWindowLevel( diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index 98df1d3f3..235028ff0 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -27,7 +27,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2004/04/23 19:16:52 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.3 2004/10/08 00:35:05 torrey Exp $ */ /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #include "xpr.h" @@ -39,7 +39,7 @@ #include "propertyst.h" #include "dix.h" -#include "Xatom.h" +#include <X11/Xatom.h> #include "windowstr.h" #include <pthread.h> diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index 14b7d9858..fee28aa7d 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -43,8 +43,8 @@ * Please see the Client-to-Server DMX Extension to the X Protocol * document for details about the protocol. */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" diff --git a/hw/dmx/dmx_glxvisuals.c b/hw/dmx/dmx_glxvisuals.c index 539c7ab27..806927612 100644 --- a/hw/dmx/dmx_glxvisuals.c +++ b/hw/dmx/dmx_glxvisuals.c @@ -36,8 +36,8 @@ #include "dmx.h" #include <GL/glx.h> #include <GL/glxproto.h> -#include "Xext.h" -#include "extutil.h" +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> #include "dmx_glxvisuals.h" diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c index b29e6004a..48f7488f1 100644 --- a/hw/dmx/dmxdpms.c +++ b/hw/dmx/dmxdpms.c @@ -48,7 +48,7 @@ #include "dpmsproc.h" #endif #include "windowstr.h" /* For screenIsSaved */ -#include "X11/extensions/dpms.h" +#include <X11/extensions/dpms.h> static unsigned long dpmsGeneration = 0; static Bool dpmsSupported = TRUE; diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 00ce18425..438c4eb21 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -54,7 +54,7 @@ #include "dmxpict.h" #endif -#include "Xos.h" /* For gettimeofday */ +#include <X11/Xos.h> /* For gettimeofday */ #include "dixstruct.h" #include "panoramiXsrv.h" @@ -64,8 +64,8 @@ #include <GL/glx.h> #include <GL/glxint.h> #include "dmx_glxvisuals.h" -#include "Xext.h" -#include "extutil.h" +#include <X11/extensions/Xext.h> +#include <X11/extensions/extutil.h> extern void GlxSetVisualConfigs( int nconfigs, diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c index 92cc6979e..72aa0f87a 100644 --- a/hw/dmx/dmxlog.c +++ b/hw/dmx/dmxlog.c @@ -40,8 +40,8 @@ #include "dmxlog.h" #include "dmxinput.h" #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #endif static dmxLogLevel dmxCurrentLogLevel = dmxDebug; diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c index 69dda63fe..7e831a5fe 100644 --- a/hw/dmx/dmxpict.c +++ b/hw/dmx/dmxpict.c @@ -46,8 +46,8 @@ #include "pixmapstr.h" #include "dixstruct.h" -#include "render.h" -#include "renderproto.h" +#include <X11/extensions/render.h> +#include <X11/extensions/renderproto.h> #include "picture.h" #include "picturestr.h" #include "mipict.h" diff --git a/hw/dmx/dmxstat.c b/hw/dmx/dmxstat.c index ced4c8bba..ae3f40458 100644 --- a/hw/dmx/dmxstat.c +++ b/hw/dmx/dmxstat.c @@ -46,7 +46,7 @@ #include "dmx.h" #include "dmxstat.h" #include "dmxlog.h" -#include "Xos.h" /* For sys/time.h */ +#include <X11/Xos.h> /* For sys/time.h */ /** Used to compute a running average of value. */ typedef struct _DMXStatAvg { diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c index 8fd52d298..15b25795c 100644 --- a/hw/dmx/input/dmxeq.c +++ b/hw/dmx/input/dmxeq.c @@ -78,7 +78,7 @@ #include "scrnintstr.h" /* For screenInfo */ #ifdef XINPUT -#include "XIproto.h" +#include <X11/extensions/XIproto.h> #define EXTENSION_PROC_ARGS void * #include "extinit.h" /* For LookupDeviceIntRec */ #endif diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 4dd52ba3c..0ac9e8025 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -70,8 +70,8 @@ #include "windowstr.h" #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "exevents.h" #define EXTENSION_PROC_ARGS void * #include "extinit.h" diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c index d080ebbcf..1d53e9f0f 100644 --- a/hw/dmx/input/dmxxinput.c +++ b/hw/dmx/input/dmxxinput.c @@ -38,11 +38,11 @@ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "inputstr.h" -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "mipointer.h" diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c index 0d973c91b..c162aa952 100644 --- a/hw/dmx/input/lnx-keyboard.c +++ b/hw/dmx/input/lnx-keyboard.c @@ -152,7 +152,7 @@ /*****************************************************************************/ #include "inputstr.h" -#include "Xos.h" +#include <X11/Xos.h> #include <sys/ioctl.h> #include <errno.h> #include <signal.h> diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c index bb2f56e93..c7218f6b7 100644 --- a/hw/dmx/input/lnx-ms.c +++ b/hw/dmx/input/lnx-ms.c @@ -70,7 +70,7 @@ * (see the source code for complete references). */ #include "inputstr.h" -#include "Xos.h" +#include <X11/Xos.h> #include <errno.h> #include <termios.h> diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c index 73ac29ea9..c83b1ecb7 100644 --- a/hw/dmx/input/lnx-ps2.c +++ b/hw/dmx/input/lnx-ps2.c @@ -67,7 +67,7 @@ * for complete references). */ #include "inputstr.h" -#include "Xos.h" +#include <X11/Xos.h> #include <errno.h> #include <termios.h> diff --git a/hw/dmx/input/usb-private.h b/hw/dmx/input/usb-private.h index 6762e5552..eae9c8b7a 100644 --- a/hw/dmx/input/usb-private.h +++ b/hw/dmx/input/usb-private.h @@ -43,7 +43,7 @@ #include "dmxinputinit.h" #include "inputstr.h" -#include "Xos.h" +#include <X11/Xos.h> #include <errno.h> #include <linux/input.h> #include "usb-common.h" diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index fdece85d7..c8d877074 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -28,13 +28,13 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */ -#include "X11/X.h" +#include <X11/X.h> #define NEED_EVENTS #include "mi.h" -#include "X11/Xproto.h" +#include <X11/Xproto.h> #include "scrnintstr.h" #include "inputstr.h" -#include "X11/Xos.h" +#include <X11/Xos.h> #include "mibstore.h" #include "mipointer.h" #include "lk201kbd.h" diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 4de0878c0..f446fad38 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -32,10 +32,10 @@ from The Open Group. #include <X11/Xwinsock.h> #endif #include <stdio.h> -#include "X11/X.h" +#include <X11/X.h> #define NEED_EVENTS -#include "X11/Xproto.h" -#include "X11/Xos.h" +#include <X11/Xproto.h> +#include <X11/Xos.h> #include "scrnintstr.h" #include "servermd.h" #define PSZ 8 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" diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 9b68b81bb..c4cc3c624 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -9,7 +9,7 @@ #include "xf86.h" /* #include "xf86_ansic.h" */ /* #include "xf86_OSproc.h" */ -#include "Xatom.h" +#include <X11/Xatom.h> #include "property.h" #include "propertyst.h" #include "xf86DDC.h" diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c index ac479d326..a499db1da 100644 --- a/hw/xfree86/ddc/interpret_vdif.c +++ b/hw/xfree86/ddc/interpret_vdif.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */ -#include "Xarch.h" +#include <X11/Xarch.h> #include "xf86DDC.h" #include "vdif.h" diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 7a647031a..5c129aef0 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -22,7 +22,7 @@ #define VDIF_POLARITY_NEGATIVE 0 #define VDIF_POLARITY_POSITIVE 1 -#include "Xmd.h" +#include <X11/Xmd.h> #undef CARD32 #define CARD32 unsigned int /* ... on all supported platforms */ diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index 229efa446..eb9791098 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -3,7 +3,7 @@ #ifndef __DGAPROC_H #define __DGAPROC_H -#include "Xproto.h" +#include <X11/Xproto.h> #include "pixmap.h" #define DGA_CONCURRENT_ACCESS 0x00000001 diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index 56776accf..b4e9a1e94 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -29,7 +29,7 @@ #include "xf86Module.h" #include "xf86Opt.h" -#include "Xproto.h" +#include <X11/Xproto.h> #include "modinit.h" diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 6fa07c7e6..b0f239936 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.1.4.1 2003/12/18 19:29:12 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2004/04/23 18:44:43 eich Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */ #ifndef INITARGS @@ -8,26 +8,26 @@ #ifdef SHAPE extern void ShapeExtensionInit(INITARGS); #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include "shapestr.h" +#include <X11/extensions/shapestr.h> #endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include "multibufst.h" +#include <X11/extensions/multibufst.h> #endif #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #define _MITMISC_SERVER_ -#include "mitmiscstr.h" +#include <X11/extensions/mitmiscstr.h> #endif #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ -#include "XTest.h" -#include "xteststr.h" +#include <X11/extensions/XTest.h> +#include <X11/extensions/xteststr.h> #endif #if 1 @@ -36,49 +36,49 @@ extern void XTestExtension1Init(INITARGS); #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); -#include "bigreqstr.h" +#include <X11/extensions/bigreqstr.h> #endif #ifdef XSYNC extern void SyncExtensionInit(INITARGS); #define _SYNC_SERVER -#include "sync.h" -#include "syncstr.h" +#include <X11/extensions/sync.h> +#include <X11/extensions/syncstr.h> #endif #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); -#include "saver.h" +#include <X11/extensions/saver.h> #endif #ifdef XCMISC extern void XCMiscExtensionInit(INITARGS); -#include "xcmiscstr.h" +#include <X11/extensions/xcmiscstr.h> #endif #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); #define _XF86VIDMODE_SERVER_ -#include "xf86vmstr.h" +#include <X11/extensions/xf86vmstr.h> #endif #ifdef XF86MISC extern void XFree86MiscExtensionInit(INITARGS); #define _XF86MISC_SERVER_ #define _XF86MISC_SAVER_COMPAT_ -#include "xf86mscstr.h" +#include <X11/extensions/xf86mscstr.h> #endif #ifdef XFreeXDGA extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGARegister(INITARGS); #define _XF86DGA_SERVER_ -#include "xf86dgastr.h" +#include <X11/extensions/xf86dgastr.h> #endif #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); -#include "dpmsstr.h" +#include <X11/extensions/dpmsstr.h> #endif #ifdef FONTCACHE @@ -91,31 +91,31 @@ extern void FontCacheExtensionInit(INITARGS); #ifdef TOGCUP extern void XcupExtensionInit(INITARGS); #define _XCUP_SERVER_ -#include "Xcupstr.h" +#include <X11/extensions/Xcupstr.h> #endif #ifdef EVI extern void EVIExtensionInit(INITARGS); #define _XEVI_SERVER_ -#include "XEVIstr.h" +#include <X11/extensions/XEVIstr.h> #endif #ifdef XV extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); extern void XvRegister(INITARGS); -#include "Xv.h" -#include "XvMC.h" +#include <X11/extensions/Xv.h> +#include <X11/extensions/XvMC.h> #endif #ifdef RES extern void ResExtensionInit(INITARGS); -#include "XResproto.h" +#include <X11/extensions/XResproto.h> #endif #ifdef SHM extern void ShmExtensionInit(INITARGS); -#include "shmstr.h" +#include <X11/extensions/shmstr.h> extern void ShmSetPixmapFormat( ScreenPtr pScreen, int format); diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c index 4565f5860..928ae9fd2 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga.c +++ b/hw/xfree86/dixmods/extmod/xf86dga.c @@ -9,8 +9,8 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -19,8 +19,8 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include "xf86dga.h" -#include "xf86dgastr.h" +#include <X11/extensions/xf86dga.h> +#include <X11/extensions/xf86dgastr.h> #include "swaprep.h" #include "dgaproc.h" diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 5ad75258e..deb1b11e5 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -8,8 +8,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "dixevents.h" @@ -20,8 +20,8 @@ #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include "xf86dga.h" -#include "xf86dgastr.h" +#include <X11/extensions/xf86dga.h> +#include <X11/extensions/xf86dgastr.h> #include "swaprep.h" #include "dgaproc.h" #include "xf86dgaext.h" diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c index c34a87690..4f263ce20 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -8,8 +8,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -18,14 +18,14 @@ #include "servermd.h" #define _XF86MISC_SERVER_ #undef _XF86MISC_SAVER_COMPAT_ -#include "xf86mscstr.h" +#include <X11/extensions/xf86mscstr.h> #include "swaprep.h" #include "xf86.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include "xf86miscproc.h" #if 0 -#include <X11/Xtrans.h> +#include <X11/Xtrans/Xtrans.h> #include "../os/osdep.h" #include <X11/Xauth.h> #ifndef USL diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index e85c5bd61..464ba23dc 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -29,21 +29,21 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ -/* $XdotOrg: xc/programs/Xserver/Xext/xf86vmode.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xf86vmode.c,v 1.3 2004/12/12 23:29:20 krh 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 */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" #include "servermd.h" #define _XF86VIDMODE_SERVER_ -#include "xf86vmstr.h" +#include <X11/extensions/xf86vmstr.h> #include "swaprep.h" #include "xf86.h" #include "vidmodeproc.h" diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 0395ba877..7466e9a4f 100644 --- a/hw/xfree86/dixmods/extmod/xvmod.c +++ b/hw/xfree86/dixmods/extmod/xvmod.c @@ -1,11 +1,11 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "scrnintstr.h" #include "gc.h" -#include "Xv.h" -#include "Xvproto.h" +#include <X11/extensions/Xv.h> +#include <X11/extensions/Xvproto.h> #include "xvdix.h" #include "xvmodproc.h" diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c index ab413ac2f..49fa254cc 100644 --- a/hw/xfree86/dixmods/laymodule.c +++ b/hw/xfree86/dixmods/laymodule.c @@ -25,7 +25,7 @@ #ifdef XFree86LOADER #include "xf86Module.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c index 9f8fc2a1c..28f971a62 100644 --- a/hw/xfree86/dixmods/shmodule.c +++ b/hw/xfree86/dixmods/shmodule.c @@ -25,7 +25,7 @@ #ifdef XFree86LOADER #include "xf86Module.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 0a631782d..c870e9a82 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -44,8 +44,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index ae5a6d608..31fb1d748 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -42,8 +42,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index ec437d8df..cd7942a62 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index c1b0fa988..51ea1bab5 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 6b910d5b3..f5a9e414e 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index d6e5c65a1..3a18e5eb8 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index 30bc93e71..3e25c5aac 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 4b7226e17..b7a7f1cc4 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index f0cb2e127..7c1fb3497 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index c6f8e523f..fd912f681 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index f6164a8da..106ab2116 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 33f05ec9c..d2140d609 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 4ad5a1a51..a197cc49c 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index 50701741f..1b08c3dc7 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index 410d7b645..47baa655c 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index d488d3615..261739268 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index e002948a2..fe00d5b7d 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index 308f6230d..31c6b2749 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index b660d45b3..56ca5a986 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index 8d9591442..d2aab860c 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 2f959a95c..1959609dc 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 1f4614ba3..c5aa5098b 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 0ca3c93ef..6f791aea0 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -23,7 +23,7 @@ #include "globals.h" #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> #define DEBUG 0 diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index 199519629..f6988842f 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -14,8 +14,8 @@ #include "xf86_ansic.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" diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index c17e95d16..9e137df41 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -9,8 +9,8 @@ #ifndef _XF86INT10_H #define _XF86INT10_H -#include "Xmd.h" -#include "Xdefs.h" +#include <X11/Xmd.h> +#include <X11/Xdefs.h> #include "xf86Pci.h" #define SEG_ADDR(x) (((x) >> 4) & 0x00F000) diff --git a/hw/xfree86/loader/aout.h b/hw/xfree86/loader/aout.h index 0fe454e97..3f60f37d7 100644 --- a/hw/xfree86/loader/aout.h +++ b/hw/xfree86/loader/aout.h @@ -35,7 +35,7 @@ #ifndef _AOUT_H #define _AOUT_H -#include "Xos.h" +#include <X11/Xos.h> /* Get prototype for ntohl. */ #include <ctype.h> diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c index 0a4877977..971c58ca3 100644 --- a/hw/xfree86/loader/aoutloader.c +++ b/hw/xfree86/loader/aoutloader.c @@ -44,7 +44,7 @@ #define Xfree(size) free(size) #endif -#include "Xos.h" +#include <X11/Xos.h> #include "os.h" #include "aout.h" diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c index 164c7d167..c7442b3fa 100644 --- a/hw/xfree86/loader/coffloader.c +++ b/hw/xfree86/loader/coffloader.c @@ -39,7 +39,7 @@ #define Xfree(size) free(size) #endif -#include "Xos.h" +#include <X11/Xos.h> #include "os.h" #include "coff.h" diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 6b921afcb..13d7cd54b 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.7 2004/09/14 23:21:22 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.8 2005/04/01 20:05:11 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03 * 17:11:29 tsi Exp $ */ @@ -72,7 +72,7 @@ #include "swaprep.h" #include "swapreq.h" #include "inputstr.h" -#include "XIproto.h" +#include <X11/extensions/XIproto.h> #include "exevents.h" #include "extinit.h" #ifdef XV diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index 9d3011caf..7527b5dd7 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <dlfcn.h> -#include "Xos.h" +#include <X11/Xos.h> #include "os.h" #include "sym.h" diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index aa96fa08d..d78fbdcc2 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.4 2004/11/09 15:58:41 ajax Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.5 2005/04/04 09:47:07 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */ /* @@ -46,7 +46,7 @@ # define Xfree(size) free(size) #endif -#include "Xos.h" +#include <X11/Xos.h> #include "os.h" #include "elf.h" diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index 6626dae6a..12f3c63b4 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.25 2003/11/23 00:57:56 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.2 2004/04/23 19:54:06 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.24 2003/11/17 22:20:40 dawes Exp $ */ /* @@ -25,7 +25,7 @@ */ #include "os.h" -#include "Xos.h" +#include <X11/Xos.h> #undef abs #include <stdlib.h> #include "sym.h" diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 24048535d..31500dda1 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -26,7 +26,7 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index 1a2313226..b52b85425 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -59,7 +59,7 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index f999561cf..5ac2e08b5 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -1,8 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.8 2002/05/22 21:38:29 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.6 2001/02/16 14:45:10 tsi Exp $ */ /* Resource information code */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Privstr.h" @@ -18,7 +18,7 @@ resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END}; #ifdef INCLUDE_XF86_NO_DOMAIN -#if defined(__alpha__) || defined(__sparc64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) resPtr xf86BusAccWindowsFromOS(void) diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c index 542eb2630..fcff3d6e7 100644 --- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c +++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c @@ -8,8 +8,8 @@ * and from xf86KbdCODrv.c by Holger Veit */ -#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/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index adb101dc5..3c3170fe1 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.6 1998/07/25 16:56:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.5.4.3 1998/06/05 16:23:03 dawes Exp $ */ /* * Derived from VTsw_usl.c which is * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -25,7 +25,7 @@ */ /* $XConsortium: bsd_VTsw.c /main/4 1996/02/21 17:50:57 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index 250e5cb55..af2138e26 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_apm.c,v 1.1 2000/02/29 03:09:25 dawes Exp $ */ +/* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index c38ac073c..bed119fe2 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ +/* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" @@ -23,9 +23,9 @@ axpDevice bsdGetAXP(void); typedef struct { char *name; int type; -} AXP; +} _AXP; -static AXP axpList[] = { +static _AXP axpList[] = { {"apecs",APECS}, {"pyxis",PYXIS}, {"cia",CIA}, diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index ec95306e8..a46c616da 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.2 2001/02/27 23:05:00 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "input.h" #include "scrnintstr.h" #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 8b786a7c8..02e7825b4 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.20 2003/06/30 16:52:57 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.21 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -25,7 +25,7 @@ */ /* $XConsortium: bsd_init.c /main/8 1996/10/23 13:13:05 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" @@ -160,7 +160,7 @@ xf86OpenConsole() /* check if we are run with euid==0 */ if (geteuid() != 0) { - FatalError("xf86OpenConsole: Server must be suid root\n"); + FatalError("xf86OpenConsole: Server must be suid root"); } if (!KeepTty) @@ -198,7 +198,7 @@ xf86OpenConsole() strcat(cons_drivers, supported_drivers[i]); } FatalError( - "%s: No console driver found\n\tSupported drivers: %s\n\t%s\n", + "%s: No console driver found\n\tSupported drivers: %s\n\t%s", "xf86OpenConsole", cons_drivers, CHECK_DRIVER_MSG); } #if 0 /* stdin is already closed in OsInit() */ @@ -213,7 +213,7 @@ xf86OpenConsole() case PCCONS: if (ioctl (xf86Info.consoleFd, CONSOLE_X_MODE_ON, 0) < 0) { - FatalError("%s: CONSOLE_X_MODE_ON failed (%s)\n%s\n", + FatalError("%s: CONSOLE_X_MODE_ON failed (%s)\n%s", "xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG); } @@ -282,18 +282,18 @@ acquire_vt: vtmode.frsig = SIGUSR1; if (ioctl(xf86Info.consoleFd, VT_SETMODE, &vtmode) < 0) { - FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n"); + FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed"); } #if !defined(USE_DEV_IO) && !defined(USE_I386_IOPL) if (ioctl(xf86Info.consoleFd, KDENABIO, 0) < 0) { - FatalError("xf86OpenConsole: KDENABIO failed (%s)\n", + FatalError("xf86OpenConsole: KDENABIO failed (%s)", strerror(errno)); } #endif if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0) { - FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed\n"); + FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed"); } break; #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */ @@ -337,7 +337,7 @@ xf86OpenPccons() if (ioctl(fd, CONSOLE_X_MODE_OFF, 0) < 0) { FatalError( - "%s: CONSOLE_X_MODE_OFF failed (%s)\n%s\n%s\n", + "%s: CONSOLE_X_MODE_OFF failed (%s)\n%s\n%s", "xf86OpenPccons", strerror(errno), "Was expecting pccons driver with X support", @@ -427,11 +427,11 @@ xf86OpenSyscons() { if (syscons_version >= 0x100) { - FatalError("%s: Cannot find a free VT\n", + FatalError("%s: Cannot find a free VT", "xf86OpenSyscons"); } /* Should no longer reach here */ - FatalError("%s: %s %s\n\t%s %s\n", + FatalError("%s: %s %s\n\t%s %s", "xf86OpenSyscons", "syscons versions prior to 1.0 require", "either the", @@ -450,18 +450,18 @@ xf86OpenSyscons() #endif if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0) { - FatalError("xf86OpenSyscons: Cannot open %s (%s)\n", + FatalError("xf86OpenSyscons: Cannot open %s (%s)", vtname, strerror(errno)); } if (ioctl(fd, VT_GETMODE, &vtmode) < 0) { - FatalError("xf86OpenSyscons: VT_GETMODE failed\n"); + FatalError("xf86OpenSyscons: VT_GETMODE failed"); } xf86Info.consType = SYSCONS; xf86Msg(X_PROBED, "Using syscons driver with X support"); if (syscons_version >= 0x100) { - xf86ErrorF(" (version %d.%d)\n", syscons_version >> 8, + xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8, syscons_version & 0xFF); } else @@ -515,7 +515,7 @@ xf86OpenPcvt() { if(ioctl(fd, VT_GETMODE, &vtmode) < 0) { - FatalError("%s: VT_GETMODE failed\n%s%s\n%s\n", + FatalError("%s: VT_GETMODE failed\n%s%s\n%s", "xf86OpenPcvt", "Found pcvt driver but X11 seems to be", " not supported.", CHECK_DRIVER_MSG); @@ -554,7 +554,7 @@ xf86OpenPcvt() } else { - FatalError("%s: Cannot find a free VT\n", + FatalError("%s: Cannot find a free VT", "xf86OpenPcvt"); } } @@ -564,12 +564,12 @@ xf86OpenPcvt() sprintf(vtname, "%s%01x", vtprefix, xf86Info.vtno - 1); if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) { - FatalError("xf86OpenPcvt: Cannot open %s (%s)\n", + FatalError("xf86OpenPcvt: Cannot open %s (%s)", vtname, strerror(errno)); } if (ioctl(fd, VT_GETMODE, &vtmode) < 0) { - FatalError("xf86OpenPcvt: VT_GETMODE failed\n"); + FatalError("xf86OpenPcvt: VT_GETMODE failed"); } xf86Info.consType = PCVT; #ifdef WSCONS_SUPPORT @@ -616,7 +616,7 @@ xf86OpenWScons() } if (fd != -1) { if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) < 0) { - FatalError("%s: WSDISPLAYIO_MODE_MAPPED failed (%s)\n%s\n", + FatalError("%s: WSDISPLAYIO_MODE_MAPPED failed (%s)\n%s", "xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG); } @@ -654,7 +654,7 @@ xf86CloseConsole() #if !defined(USE_DEV_IO) && !defined(USE_I386_IOPL) if (ioctl(xf86Info.consoleFd, KDDISABIO, 0) < 0) { - xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)\n", + xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)", strerror(errno)); } #endif @@ -678,7 +678,7 @@ xf86CloseConsole() close(xf86Info.consoleFd); if ((xf86Info.consoleFd = open("/dev/console",O_RDONLY,0)) <0) { - xf86FatalError("xf86CloseConsole: Cannot open /dev/console (%s)\n", + xf86FatalError("xf86CloseConsole: Cannot open /dev/console (%s)", strerror(errno)); } } diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index 0f40ba707..e44629f89 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.23 2002/10/21 20:38:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.22 2002/05/18 21:15:16 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -26,7 +26,7 @@ /* $XConsortium: bsd_io.c /main/11 1996/10/19 18:06:07 kaleb $ */ #define NEED_EVENTS -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 190e6378b..4cf2fbaae 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -10,7 +10,7 @@ */ #define NEED_EVENTS -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index 53fe8c3be..e0e30bc03 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -28,7 +28,7 @@ */ /* $OpenBSD: bsd_kqueue_apm.c,v 1.5 2002/07/30 23:07:42 matthieu Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index 679f3099a..a830b60c0 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -27,7 +27,7 @@ * authorization from the copyright holder(s) and author(s). */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index abec95b91..54b4c8848 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -26,7 +26,7 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index 4f077a630..e2550bf86 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */ +/* $XFree86: ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -26,7 +26,7 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" @@ -80,7 +80,7 @@ ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, fd, Base); if (base == MAP_FAILED) - FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)\n", + FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)", "xf86MapVidMem", Size, Base, strerror(errno)); return base; @@ -102,7 +102,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, if (kmem == -1) { kmem = open(DEV_MEM, 2); if (kmem == -1) { - FatalError("xf86ReadBIOS: open %s\n", DEV_MEM); + FatalError("xf86ReadBIOS: open %s", DEV_MEM); } } diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index 8619b5df7..f73c30182 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */ +/* $XFree86: sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -27,7 +27,7 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" @@ -71,7 +71,7 @@ sparc64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, PROT_READ : (PROT_READ | PROT_WRITE), MAP_SHARED, fd, Base); if (base == MAP_FAILED) - FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)\n", + FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)", "xf86MapVidMem", Size, Base, strerror(errno)); return base; } diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index c98f6f0bc..c1c08569e 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -197,7 +197,7 @@ #include <errno.h> #include <signal.h> -#include "Xarch.h" +#include <X11/Xarch.h> #include "compiler.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 3e965265b..41ef3f866 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -104,8 +104,8 @@ #ifndef _PCI_H #define _PCI_H 1 -#include "Xarch.h" -#include "Xfuncproto.h" +#include <X11/Xarch.h> +#include <X11/Xfuncproto.h> #include "xf86Pci.h" #include "xf86PciInfo.h" diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index 57c3eef63..a8b7ef492 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -104,8 +104,8 @@ #ifndef _XF86PCI_H #define _XF86PCI_H 1 -#include "Xarch.h" -#include "Xfuncproto.h" +#include <X11/Xarch.h> +#include <X11/Xfuncproto.h> #include "misc.h" #define PCI_NOT_FOUND 0xFFFFFFFFU diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index 04e2f07c0..3b29618aa 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -2,7 +2,7 @@ /* Resource information code */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Privstr.h" @@ -190,7 +190,8 @@ xf86AccResFromOS(resPtr ret) defined(__s390__) || \ defined(__hppa__) - /* XXX this isn't exactly correct but it will get the server working + /* + * XXX this isn't exactly correct but it will get the server working * for now until we get something better. */ @@ -203,7 +204,7 @@ xf86BusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -221,7 +222,7 @@ xf86PciBusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -230,7 +231,7 @@ xf86PciBusAccWindowsFromOS(void) return ret; } -#ifdef INCLUDE_UNUSED */ +#ifdef INCLUDE_UNUSED resPtr xf86IsaBusAccWindowsFromOS(void) @@ -241,7 +242,7 @@ xf86IsaBusAccWindowsFromOS(void) RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -267,7 +268,7 @@ xf86AccResFromOS(resPtr ret) ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); ret = xf86AddResToList(ret, &range, -1); -#ifdef __sparc__ +#if defined(__sparc__) || defined(__powerpc__) RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock); #else RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock); diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c index 25639d72d..61b2e12b5 100644 --- a/hw/xfree86/os-support/linux/lnx_KbdMap.c +++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ +/* $XFree86$ */ /* * Slightly modified xf86KbdLnx.c which is @@ -6,8 +6,8 @@ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. */ -#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/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 381973dd0..316d4ecb2 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -9,7 +9,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index fae2e2108..b16d51cf9 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index 5813ef4e9..c96e7a118 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.5 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */ #include <stdio.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index bfcb0d70f..05c1dd097 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.7 2002/11/25 14:05:04 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "input.h" #include "scrnintstr.h" #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_font.c b/hw/xfree86/os-support/linux/lnx_font.c index 05bf7da67..d809f97af 100644 --- a/hw/xfree86/os-support/linux/lnx_font.c +++ b/hw/xfree86/os-support/linux/lnx_font.c @@ -23,8 +23,8 @@ *ings in this Software without prior written authorization from Egbert Eich. * */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 4246e86eb..1a4442547 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.3 2005/01/14 18:42:26 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 1.4 2005/01/28 16:12:59 eich 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> @@ -26,8 +26,8 @@ */ /* $XConsortium: lnx_init.c /main/7 1996/10/23 18:46:30 kaleb $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index 1eebc757a..5de501ae8 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -26,7 +26,7 @@ /* $XConsortium: lnx_io.c /main/8 1996/10/19 18:06:28 kaleb $ */ #define NEED_EVENTS -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index 18eff7fe6..aa959b927 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -10,7 +10,7 @@ */ #define NEED_EVENTS -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_mouse.c b/hw/xfree86/os-support/linux/lnx_mouse.c index 8bc7e6331..a03e2f747 100644 --- a/hw/xfree86/os-support/linux/lnx_mouse.c +++ b/hw/xfree86/os-support/linux/lnx_mouse.c @@ -1,13 +1,17 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_mouse.c,v 1.1 1999/05/17 13:17:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_mouse.c,v 1.2 2003/10/08 14:58:30 dawes Exp $ */ /* * Copyright 1999 by The XFree86 Project, Inc. */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" #include "xf86OSmouse.h" +#include "xf86_OSlib.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> static int SupportedInterfaces(void) @@ -15,6 +19,172 @@ SupportedInterfaces(void) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO; } +static const char * +DefaultProtocol(void) +{ + return "Auto"; +} + +#define DEFAULT_MOUSE_DEV "/dev/mouse" +#define DEFAULT_PS2_DEV "/dev/psaux" +#define DEFAULT_GPM_DATA_DEV "/dev/gpmdata" +#define DEFAULT_GPM_CTL_DEV "/dev/gpmdata" + +static const char *mouseDevs[] = { + DEFAULT_MOUSE_DEV, + DEFAULT_PS2_DEV, + DEFAULT_GPM_DATA_DEV, + NULL +}; + +typedef enum { + MOUSE_PROTO_UNKNOWN = 0, + MOUSE_PROTO_SERIAL, + MOUSE_PROTO_PS2, + MOUSE_PROTO_MSC, + MOUSE_PROTO_GPM +} protocolTypes; + +static struct { + protocolTypes proto; + const char *name; +} devproto[] = { + { MOUSE_PROTO_UNKNOWN, NULL }, + { MOUSE_PROTO_PS2, "PS/2" }, + { MOUSE_PROTO_MSC, "MouseSystems" }, + { MOUSE_PROTO_GPM, "GPM" } +}; + +static const char * +FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) +{ + int fd = -1; + const char **pdev; + + for (pdev = mouseDevs; *pdev; pdev++) { + SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK | O_EXCL)); + if (fd == -1) { +#ifdef DEBUG + ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno)); +#endif + } else + break; + } + + if (*pdev) { + close(fd); + /* Set the Device option. */ + pInfo->conf_idev->commonOptions = + xf86AddNewOption(pInfo->conf_idev->commonOptions, "Device", *pdev); + xf86Msg(X_INFO, "%s: Setting Device option to \"%s\"\n", + pInfo->name, *pdev); + } + + return *pdev; +} + +static const char * +GuessProtocol(InputInfoPtr pInfo, int flags) +{ + int fd = -1; + const char *dev; + char *realdev; + struct stat sbuf; + int i; + int proto = MOUSE_PROTO_UNKNOWN; + + dev = xf86SetStrOption(pInfo->conf_idev->commonOptions, "Device", NULL); + if (!dev) { +#ifdef DEBUG + ErrorF("xf86SetStrOption failed to return the device name\n"); +#endif + return NULL; + } + /* Look at the device name to guess the protocol. */ + realdev = NULL; + if (strcmp(dev, DEFAULT_MOUSE_DEV) == 0) { + if (lstat(dev, &sbuf) != 0) { +#ifdef DEBUG + ErrorF("lstat failed for %s (%s)\n", dev, strerror(errno)); +#endif + return NULL; + } + if (S_ISLNK(sbuf.st_mode)) { + realdev = xnfalloc(PATH_MAX + 1); + i = readlink(dev, realdev, PATH_MAX); + if (i <= 0) { +#ifdef DEBUG + ErrorF("readlink failed for %s (%s)\n", dev, strerror(errno)); +#endif + xfree(realdev); + return NULL; + } + realdev[i] = '\0'; + } + } + if (!realdev) + realdev = xnfstrdup(dev); + else { + /* If realdev doesn't contain a '/' then prepend "/dev/" */ + if (!strchr(realdev, '/')) { + char *tmp = xnfalloc(strlen(realdev) + 5 + 1); + sprintf(tmp, "/dev/%s", realdev); + xfree(realdev); + realdev = tmp; + } + } + + if (strcmp(realdev, DEFAULT_PS2_DEV) == 0) + proto = MOUSE_PROTO_PS2; + else if (strcmp(realdev, DEFAULT_GPM_DATA_DEV) == 0) + proto = MOUSE_PROTO_MSC; + else if (strcmp(realdev, DEFAULT_GPM_CTL_DEV) == 0) + proto = MOUSE_PROTO_GPM; + xfree(realdev); + /* + * If the protocol can't be guessed from the device name, + * try to characterise it. + */ + if (proto == MOUSE_PROTO_UNKNOWN) { + SYSCALL (fd = open(dev, O_RDWR | O_NONBLOCK | O_EXCL)); + if (isatty(fd)) { + /* Serial PnP has already failed, so give up. */ + } else { + if (fstat(fd, &sbuf) != 0) { +#ifdef DEBUG + ErrorF("fstat failed for %s (%s)\n", dev, strerror(errno)); +#endif + close(fd); + return NULL; + } + if (S_ISFIFO(sbuf.st_mode)) { + /* Assume GPM data in MSC format. */ + proto = MOUSE_PROTO_MSC; + } else { + /* Default to PS/2 */ + proto = MOUSE_PROTO_PS2; + } + } + close(fd); + } + if (proto == MOUSE_PROTO_UNKNOWN) { + xf86Msg(X_ERROR, "%s: GuessProtocol: Cannot find mouse protocol.\n", + pInfo->name); + return NULL; + } else { + for (i = 0; i < sizeof(devproto)/sizeof(devproto[0]); i++) { + if (devproto[i].proto == proto) { + xf86Msg(X_INFO, + "%s: GuessProtocol: " + "setting mouse protocol to \"%s\"\n", + pInfo->name, devproto[i].name); + return devproto[i].name; + } + } + } + return NULL; +} + OSMouseInfoPtr xf86OSMouseInit(int flags) { @@ -24,6 +194,9 @@ xf86OSMouseInit(int flags) if (!p) return NULL; p->SupportedInterfaces = SupportedInterfaces; + p->DefaultProtocol = DefaultProtocol; + p->FindDevice = FindDevice; + p->GuessProtocol = GuessProtocol; return p; } diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 5477b9130..074a9d7f7 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.9 2003/02/17 15:29:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */ #include <stdio.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 65f216bd6..74163fdb7 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -25,7 +25,7 @@ */ /* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 8565dcc5c..36d88a434 100644 --- a/hw/xfree86/os-support/lynxos/lynx_init.c +++ b/hw/xfree86/os-support/lynxos/lynx_init.c @@ -22,10 +22,10 @@ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.3 1998/08/29 05:43:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index e61ce76b7..364f9ee4d 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -21,9 +21,9 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.10 2003/02/17 15:11:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index dcf734965..989ee8aab 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -21,9 +21,9 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.6 2000/02/11 22:36:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mouse.c b/hw/xfree86/os-support/lynxos/lynx_mouse.c index 1dc5ff8af..2edb147fe 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mouse.c +++ b/hw/xfree86/os-support/lynxos/lynx_mouse.c @@ -4,7 +4,7 @@ * Copyright 1999 by The XFree86 Project, Inc. */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" #include "xf86OSmouse.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index 5daef9922..d9dd43d55 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -23,7 +23,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index acef268a1..b4379f7be 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -12,9 +12,9 @@ Thanks to Linus Torvalds for contributing this code. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.4 2000/02/12 20:45:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index b5de1d899..1c0e5d9f2 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,9 +1,9 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.4 2003/03/25 04:18:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */ #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index 57176c5d5..f3afcdd50 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -4,9 +4,9 @@ Stub for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.3 2000/08/04 16:13:41 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index 98546b688..9a105864e 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -4,7 +4,7 @@ for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6 2003/04/07 16:23:39 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6tsi Exp $ */ /* * Create a dependency that should be immune from the effect of register @@ -16,7 +16,7 @@ * */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" @@ -26,13 +26,13 @@ void xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len) { -#if defined(__ia64__) - outb(0x80, 0x00); -#endif while(len--) { *dst++ = *src++; -#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) +#if !defined(__sparc__) && \ + !defined(__powerpc__) && \ + !defined(__mips__) && \ + !defined(__ia64__) outb(0x80, 0x00); #endif } diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index 899c3820b..3489a0777 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.4 2003/07/07 15:34:27 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.2 1998/07/25 16:56:57 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * Copyright 1993 by David McCullough <davidm@stallion.oz.au> @@ -24,7 +24,7 @@ */ /* $XConsortium: VTsw_sco.c /main/2 1995/11/13 06:08:36 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 389664647..a0c572858 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.14 2002/11/20 23:00:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.13 2002/06/03 21:22:10 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * @@ -24,8 +24,8 @@ /* Re-written May 2001 to represent the current state of reality */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index a018e3434..18abcc8dc 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.10 2003/02/17 15:11:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.9 2002/10/11 01:40:36 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * @@ -24,7 +24,7 @@ /* Re-written May 2001 to represent the current state of reality */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index 52857bc71..f056dcbe1 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -23,7 +23,7 @@ /* $XConsortium$ */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index 37b9eb5a8..0df225b12 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.13 2002/11/20 23:07:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.12 2001/06/30 22:41:49 tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * @@ -23,7 +23,7 @@ /* $XConsortium$ */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index 3c00f5564..76d70fbd6 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.9 2003/03/14 13:46:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.8tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * @@ -37,7 +37,7 @@ * that and adjust accordingly. */ -#include "X.h" +#include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 265a45f91..795a65610 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.1.4.1 1998/06/05 16:23:20 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@XFree86.org> * @@ -23,7 +23,7 @@ */ /* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index cad9e8583..3c0ca6b6e 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -23,7 +23,7 @@ */ /* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index 5da36fa19..8c2da5166 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -34,7 +34,7 @@ #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 5c24b9751..5e516221d 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * @@ -23,7 +23,7 @@ */ /* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index ee7584222..c5cb404eb 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * @@ -23,7 +23,7 @@ */ /* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index c1af992c1..af5724cf1 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -28,7 +28,7 @@ * or the permissions are implicit with opening/enabling the console. */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index cd92886ff..64d2de967 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -26,12 +26,12 @@ #if defined(linux) && !defined(__GLIBC__) #undef __STRICT_ANSI__ #endif -#include <X.h> +#include <X11/X.h> #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif -#include <Xmd.h> -#include <Xos.h> +#include <X11/Xmd.h> +#include <X11/Xos.h> #include <sys/types.h> #include <sys/stat.h> #if defined(__bsdi__) @@ -45,7 +45,7 @@ #endif #include <stdarg.h> #include <fcntl.h> -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include "os.h" #include <ctype.h> #include <unistd.h> diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index b5f4941bc..5e8efe330 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -28,7 +28,7 @@ /* Stubs for the OS-support layer power-management functions. */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 1812729c0..362c8bcdc 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -55,7 +55,7 @@ /* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index 7bcb93a0b..3fef72e17 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -55,7 +55,7 @@ */ #ifdef XFree86Server -# include "X.h" +# include <X11/X.h> # include "xf86.h" # include "xf86drm.h" # include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index de2d20a4c..6c78cf71a 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -25,13 +25,13 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ -/* $XdotOrg: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.2 2004/06/28 18:08:26 alanc Exp $ */ #ifdef XFree86Server #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif -# include "X.h" +# include <X11/X.h> # include "xf86.h" # include "xf86Priv.h" # include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c index fd60ec509..ba0574f24 100644 --- a/hw/xfree86/os-support/shared/stdPci.c +++ b/hw/xfree86/os-support/shared/stdPci.c @@ -29,7 +29,7 @@ #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Privstr.h" diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index df781c371..72ab99849 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -31,7 +31,7 @@ #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86Privstr.h" diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index 329346910..2a030c3dc 100644 --- a/hw/xfree86/os-support/shared/std_kbdEv.c +++ b/hw/xfree86/os-support/shared/std_kbdEv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -25,7 +25,7 @@ */ /* $XConsortium: std_kbdEv.c /main/4 1996/03/11 10:47:33 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 1bb2da386..5421b11c3 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@XFree86.org> @@ -25,7 +25,7 @@ */ /* $XConsortium: sysv_kbd.c /main/3 1996/02/21 17:53:59 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index aed735680..29c8a2171 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -30,7 +30,7 @@ #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif -#include "X.h" +#include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index abdc36206..be2adaf56 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -23,15 +23,15 @@ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ -/* $XdotOrg:$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.3 2004/07/28 03:57:19 alanc Exp $ */ #include "xf86.h" #include "xf86Priv.h" #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" @@ -57,7 +57,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/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 1e9166712..ebd2bacc4 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.5 1998/07/25 16:57:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.4.4.3 1998/07/18 17:53:57 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -25,8 +25,8 @@ */ /* $XConsortium: sysv_init.c /main/4 1996/02/21 17:54:31 kaleb $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index d48efd76e..3c9e8e353 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.11 2003/02/17 15:12:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.10 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -25,7 +25,7 @@ */ /* $XConsortium: sysv_io.c /main/8 1996/10/19 18:08:06 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sysv/sysv_mouse.c b/hw/xfree86/os-support/sysv/sysv_mouse.c index cfba52c2c..7365faa06 100644 --- a/hw/xfree86/os-support/sysv/sysv_mouse.c +++ b/hw/xfree86/os-support/sysv/sysv_mouse.c @@ -4,7 +4,7 @@ * Copyright 1999 by The XFree86 Project, Inc. */ -#include "X.h" +#include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" #include "xf86OSmouse.h" diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index 8f9916244..cff22e3fe 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -25,7 +25,7 @@ */ /* $XConsortium: sysv_video.c /main/8 1996/10/25 11:38:09 kaleb $ */ -#include "X.h" +#include <X11/X.h> #define _NEED_SYSI86 #include "xf86.h" diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index 0478ee65e..755be3dab 100644 --- a/hw/xfree86/os-support/sysv/xqueue.c +++ b/hw/xfree86/os-support/sysv/xqueue.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.20 2001/03/06 18:20:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.19 2000/02/10 22:33:45 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993-1999 by The XFree86 Project, Inc. @@ -24,7 +24,7 @@ */ /* $XConsortium: xqueue.c /main/8 1996/10/19 18:08:11 kaleb $ */ -#include "X.h" +#include <X11/X.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index f4f9f94e0..eda777566 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.3 2005/03/02 11:20:29 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 1.4 2005/03/08 10:26:59 eich 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. @@ -45,7 +45,7 @@ #ifndef XF86_LIBC_H #define XF86_LIBC_H 1 -#include "Xfuncs.h" +#include <X11/Xfuncs.h> #include <stddef.h> /* diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index 816a16c94..fd18dcf2e 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -56,7 +56,7 @@ /* View/edit this file with tab stops set to 4 */ -#include "X11/Xos.h" +#include <X11/Xos.h> #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 2b8cf7171..72a4d5942 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "colormapst.h" #include "scrnintstr.h" #include "screenint.h" diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index ad9977d67..ce7938a68 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index 14cda093d..b33ea8de0 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -25,8 +25,8 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "windowstr.h" #include "mipointer.h" #include "micmap.h" diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 8231ea05a..7a67ee0fd 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -51,7 +51,7 @@ /* XXX This is including a lot of stuff that modules should not include! */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index fe69c6210..0c441cb1c 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -8,8 +8,8 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "pixmapstr.h" #include "input.h" diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c index 3c3c535ac..865a59113 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c @@ -15,7 +15,7 @@ #include <stdlib.h> #include <string.h> -#include "X.h" +#include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/utils/pcitweak/pcitweak.c b/hw/xfree86/utils/pcitweak/pcitweak.c index 7ef1150b0..a7c6a3263 100644 --- a/hw/xfree86/utils/pcitweak/pcitweak.c +++ b/hw/xfree86/utils/pcitweak/pcitweak.c @@ -32,7 +32,7 @@ * Author: David Dawes <dawes@xfree86.org> */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c index 671933a55..4ed4a1108 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -25,7 +25,7 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 27142f52a..33df80a92 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -13,9 +13,9 @@ #include "xf86.h" #include "xf86_ansic.h" #include "vbe.h" -#include "Xarch.h" +#include <X11/Xarch.h> #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> #define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x) diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index 28f8b6fc7..d73c04300 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -24,8 +24,8 @@ /* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "windowstr.h" #include "compiler.h" #include "mipointer.h" @@ -36,7 +36,7 @@ #include "xf86_ansic.h" #define _XF86DGA_SERVER_ -#include "extensions/xf86dgastr.h" +#include <X11/extensions/xf86dgastr.h> #include "dgaproc.h" diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 1ede4e731..e1ee6f27c 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -12,7 +12,7 @@ #define _NEED_SYSI86 -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 2874c2cfb..c200aee9a 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -14,7 +14,7 @@ #ifndef _VGAHW_H #define _VGAHW_H -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "input.h" #include "scrnintstr.h" @@ -27,7 +27,7 @@ #include "globals.h" #define DPMS_SERVER -#include "extensions/dpms.h" +#include <X11/extensions/dpms.h> extern int vgaHWGetIndex(void); diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 5bde21cbe..36e3a3800 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -12,7 +12,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "mi.h" #include "pixmapstr.h" #include "gcstruct.h" diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index ce19a853e..7772f3387 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ -#include "Xmd.h" +#include <X11/Xmd.h> CARD32 XAAReverseBitOrder(CARD32 v); CARD32 diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 7a036937b..a13060178 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index 9e17a187f..611acc502 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -16,7 +16,7 @@ #include "xf86_OSproc.h" #include "servermd.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "mi.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index e4439c447..24e8c907f 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index e5eba7819..a9660d3ec 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index df67342ff..d59dc4dba 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 95ecf257b..a7945b068 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -39,7 +39,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 4ba1cd853..fcd8783c8 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -36,7 +36,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index 7571ce3ca..89d6756fb 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index b7a177521..945c2e6ef 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 3eab6d46a..acd56c344 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index b7ee997e3..9af3aeec1 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -6,7 +6,7 @@ #include "xf86_OSproc.h" #include "servermd.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "mi.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index f6f2d491e..822662e39 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 9d3764506..9378bcf6c 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 3149acf5c..b40ad4aea 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 8afd479b7..f63dc9ff7 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "miline.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 914631b58..9e6f61f6f 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -23,7 +23,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "font.h" #include "scrnintstr.h" #include "dixfontstr.h" diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index b50b31bb0..e99f9c34c 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -12,7 +12,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 78c89784e..967bb1993 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.2 2004/04/23 19:54:16 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ #include "misc.h" @@ -6,7 +6,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index eb20ea8dd..dbd2357c2 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -11,7 +11,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 94790d21c..9d2622e95 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "gc.h" #include "mi.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 9c1cc715f..887fa1acc 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.2 2004/04/23 19:54:16 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ #include "misc.h" @@ -6,7 +6,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index 628a0420a..b9ca27cd8 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -27,7 +27,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 931740159..29b6d764a 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,6 +1,6 @@ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 999d7177d..d39ca834b 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 356774c29..3facb7af8 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index 2d0738242..ca7c3fb7b 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -5,7 +5,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 49089afb3..432cef4b2 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -23,7 +23,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "font.h" #include "scrnintstr.h" #include "dixfontstr.h" diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index d80a78be5..29faa1ab0 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: $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.3 2004/08/29 00:48:17 alanc Exp $ */ /* XAAPolylinesWideSolid does not maintain a span list and subsequently does @@ -30,7 +30,7 @@ Original mi code written by Keith Packard. #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "gcstruct.h" #include "regionstr.h" diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c index 9c5befcd2..7ec3dcf7f 100644 --- a/hw/xfree86/xaa/xaaWrapper.c +++ b/hw/xfree86/xaa/xaaWrapper.c @@ -1,5 +1,5 @@ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "gcstruct.h" #include "glyphstr.h" diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 933d8f733..2f75b7e32 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ -#include "Xarch.h" +#include <X11/Xarch.h> #ifndef FIXEDBASE #define CHECKRETURN(b) if(width <= ((b) * 32)) return(base + (b)) diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c index e8d911db4..b517769d9 100644 --- a/hw/xfree86/xf8_16bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c @@ -6,8 +6,8 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.7 2000/01/21 01:12:24 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "servermd.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c index 277abafc8..f2253de28 100644 --- a/hw/xfree86/xf8_16bpp/cfbwindow.c +++ b/hw/xfree86/xf8_16bpp/cfbwindow.c @@ -6,7 +6,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.4tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #define PSZ 8 diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 3ebddd2d2..437f031cc 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -5,7 +5,7 @@ #undef PSZ #include "cfb32.h" #include "cfb8_32.h" -#include "X.h" +#include <X11/X.h> #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 2bfda9f6f..7d4812841 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c index b08288f19..14b6f7350 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c @@ -1,8 +1,8 @@ /* $XFree86$ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index f55aeb86c..03a5870bd 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -61,9 +61,9 @@ LOWMEMFTPT False False False False /* This gets built twice. Once for 8bpp and another for 32bpp */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "cfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index 635861bb5..9a3bfc5ef 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -1,8 +1,8 @@ /* $XFree86$ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #define PSZ 8 #include "cfb.h" #undef PSZ diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index 19f9055e3..fd60c1631 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ #define PSZ 32 -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "cfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 0510ae3c5..25736fa74 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 107536fd4..0fcd18843 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,7 +1,7 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.2 2004/04/23 19:54:21 eich Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index dc23d912c..f67a7093c 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,8 +1,8 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "servermd.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index 3576a41c3..2ea23c59b 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #define PSZ 8 diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 226835249..71dddafe6 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -11,7 +11,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "regionstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c index 02f6cd21f..8ee2a0e43 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -9,8 +9,8 @@ /* $XFree86$ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "servermd.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c index b16266e93..669ef9f63 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -1,7 +1,7 @@ /* $XFree86$ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "servermd.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c index b11f05f1d..1000c65f1 100644 --- a/hw/xfree86/xf8_32wid/cfbwindow.c +++ b/hw/xfree86/xf8_32wid/cfbwindow.c @@ -9,7 +9,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.2tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #define PSZ 8 diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index cc9a2707f..75aa396fb 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86$ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index bcebc10cd..61f4c44c0 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86$ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "window.h" #include "windowstr.h" diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index aaab62c23..cea8b60d0 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 69a3c208f..a580c4ce2 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -14,9 +14,9 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index a0256c313..259466adc 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -14,9 +14,9 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */ -#include "X.h" -#include "Xatom.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xatom.h> +#include <X11/Xproto.h> #include "misc.h" #include "regionstr.h" #include "font.h" diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index 7141e9cb9..f9f8ab9a1 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index 4ccc0b916..b3cccc2d5 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "regionstr.h" #include "fontstruct.h" #include "gcstruct.h" diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c index 1ffc54764..421234316 100644 --- a/hw/xnest/GetTime.c +++ b/hw/xnest/GetTime.c @@ -31,7 +31,7 @@ from the X Consortium. /* $XFree86$ */ -#include "Xos.h" +#include <X11/Xos.h> #include "os.h" #include <time.h> diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index 5344e4e50..362e9a4b6 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 0133ded35..3fac15e63 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "screenint.h" #include "input.h" #include "misc.h" diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index d63faca52..f786819a5 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -1,5 +1,5 @@ /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.2 2004/04/23 19:54:21 eich Exp $ */ /* Copyright 1993 by Davor Matic @@ -16,8 +16,8 @@ is" without express or implied warranty. /* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "keysym.h" #include "screenint.h" #include "inputstr.h" diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 5a92dc271..569382203 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 853a48955..abd258d6c 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86$ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "screenint.h" #include "inputstr.h" #include "input.h" diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 3dec48b5f..1ce79cc52 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "dix.h" #include "mi.h" diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c index d7006207a..be9299c31 100644 --- a/hw/xnest/TestExt.c +++ b/hw/xnest/TestExt.c @@ -25,7 +25,7 @@ is" without express or implied warranty. #include "servermd.h" #include "mipointer.h" #define XTestSERVER_SIDE -#include "xtestext1.h" +#include <X11/extensions/xtestext1.h> #include "xtest1dd.h" extern CARD32 lastEventTime; diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index f88e587b9..93e9fb38a 100644 --- a/hw/xnest/Visual.c +++ b/hw/xnest/Visual.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86$ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "dix.h" #include "mi.h" diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index a8d65fb7c..6d2fccc31 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -14,8 +14,8 @@ is" without express or implied warranty. */ /* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "gcstruct.h" #include "window.h" #include "windowstr.h" diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c index 2e3b7b399..0868b4480 100644 --- a/hw/xnest/os2Stub.c +++ b/hw/xnest/os2Stub.c @@ -33,7 +33,7 @@ /* things so it cannot be used as a general select. */ #define I_NEED_OS2_H -#include "Xpoll.h" +#include <X11/Xpoll.h> #include <stdio.h> #include <sys/select.h> #include <sys/errno.h> diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 0dd43d724..69bdbdc6a 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -39,7 +39,7 @@ from The Open Group. #include <mntent.h> #endif #if defined(XKB) && defined(WIN32) -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif #ifdef RELOCATE_PROJECTROOT #include <shlobj.h> diff --git a/hw/xwin/win.h b/hw/xwin/win.h index c332087ad..8175081e5 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -152,10 +152,10 @@ #endif /* MAP_FILE */ #endif /* HAS_MMAP */ -#include "X11/X.h" -#include "X11/Xproto.h" -#include "X11/Xos.h" -#include "X11/Xprotostr.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xos.h> +#include <X11/Xprotostr.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "pixmap.h" diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c index 155ed4add..596c08eb4 100644 --- a/hw/xwin/winauth.c +++ b/hw/xwin/winauth.c @@ -34,8 +34,8 @@ /* Includes for authorization */ #include "X11/Xauth.h" #define _SECURITY_SERVER -#include "X11/extensions/security.h" -#include "X11/extensions/securstr.h" +#include <X11/extensions/security.h> +#include <X11/extensions/securstr.h> /* diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h index 559409a81..445c01b27 100644 --- a/hw/xwin/winclipboard.h +++ b/hw/xwin/winclipboard.h @@ -46,13 +46,13 @@ #include <pthread.h> /* X headers */ -#include "X11/X.h" -#include "X11/Xatom.h" +#include <X11/X.h> +#include <X11/Xatom.h> /* NOTE: For some unknown reason, including Xproto.h solves * tons of problems with including windows.h. Unknowns reasons * are usually bad, so someone should investigate this. */ -#include "X11/Xproto.h" +#include <X11/Xproto.h> #include "X11/Xutil.h" #include "X11/Xlocale.h" diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c index 910699dc3..c990e7ec7 100755 --- a/hw/xwin/winclipboardwrappers.c +++ b/hw/xwin/winclipboardwrappers.c @@ -30,7 +30,7 @@ #include "win.h" #include "dixstruct.h" -#include "X11/Xatom.h" +#include <X11/Xatom.h> /* diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 047e33b02..1764dd3d5 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -36,7 +36,7 @@ #ifdef XKB #define XKB_IN_SERVER -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif #ifdef XWIN_XF86CONFIG diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index cfca00efc..bdd48c83f 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -40,7 +40,7 @@ #ifdef XKB #define XKB_IN_SERVER -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif static Bool g_winKeyState[NUM_KEYCODES]; diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c index ddbbf143a..96dc26f0e 100755 --- a/hw/xwin/winmultiwindowclass.c +++ b/hw/xwin/winmultiwindowclass.c @@ -29,7 +29,7 @@ */ /* $XFree86$ */ -#include "X11/Xatom.h" +#include <X11/Xatom.h> #include "propertyst.h" #include "windowstr.h" #include "winmultiwindowclass.h" diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index 6d9cc93c2..5230b16e0 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -32,7 +32,7 @@ /* $XFree86: $ */ /* Need Bool */ -#include "Xdefs.h" +#include <X11/Xdefs.h> /* Need TRUE */ #include "misc.h" diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c index 9d7072e83..e73cecbd2 100644 --- a/hw/xwin/winpushpxl.c +++ b/hw/xwin/winpushpxl.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c index 23e982638..4e1b65979 100755 --- a/hw/xwin/winvideo.c +++ b/hw/xwin/winvideo.c @@ -29,8 +29,8 @@ */ #include "win.h" -#include "Xv.h" -#include "Xvproto.h" +#include <X11/extensions/Xv.h> +#include <X11/extensions/Xvproto.h> void winInitVideo (ScreenPtr pScreen); @@ -63,7 +63,7 @@ winInitVideo (ScreenPtr pScreen) #include "../xfree86/common/xf86.h" #include "../Xext/xvdix.h" #include "../xfree86/common/xf86xv.h" -#include "Xv.h" +#include <X11/extensions/Xv.h> #endif #include "win.h" diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c index 4a065f4f9..1fa77b208 100755 --- a/hw/xwin/winwin32rootless.c +++ b/hw/xwin/winwin32rootless.c @@ -39,7 +39,7 @@ #include "dixevents.h" #include "winmultiwindowclass.h" #include "winprefs.h" -#include "Xatom.h" +#include <X11/Xatom.h> /* diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c index 20fbcd630..4a59aef8c 100755 --- a/hw/xwin/winwin32rootlesswndproc.c +++ b/hw/xwin/winwin32rootlesswndproc.c @@ -35,7 +35,7 @@ #include "windowswmstr.h" #include "dixevents.h" #include "propertyst.h" -#include "Xatom.h" +#include <X11/Xatom.h> #include "winmultiwindowclass.h" #include "winmsg.h" |