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 | |
| 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.
672 files changed, 1649 insertions, 1475 deletions
diff --git a/Xext/EVI.c b/Xext/EVI.c index 820312cca..f4f0eea1f 100644 --- a/Xext/EVI.c +++ b/Xext/EVI.c @@ -23,13 +23,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include "XEVIstr.h" +#include <X11/extensions/XEVIstr.h> #include "EVIstruct.h" #include "modinit.h" diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 1c05b815f..9d84f92d4 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -28,8 +28,8 @@ from The Open Group. #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" @@ -38,14 +38,14 @@ from The Open Group. #include "colormapst.h" #include "servermd.h" #define _XAG_SERVER_ -#include "Xagstr.h" -#include "Xagsrv.h" +#include <X11/extensions/Xagstr.h> +#include <X11/extensions/Xagsrv.h> #define _SECURITY_SERVER -#include "security.h" -#include "Xfuncproto.h" +#include <X11/extensions/security.h> +#include <X11/Xfuncproto.h> #define XSERV_t -#include <X11/Xtrans.h> +#include <X11/Xtrans/Xtrans.h> #include "../os/osdep.h" #include <stdio.h> diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 893fe9d13..d71a9afe3 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -29,13 +29,13 @@ from The Open Group. /* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include "bigreqstr.h" +#include <X11/extensions/bigreqstr.h> #include "opaque.h" #include "modinit.h" diff --git a/Xext/cup.c b/Xext/cup.c index d5475d3d8..2ada50f63 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -28,8 +28,8 @@ in this Software without prior written authorization from The Open Group. #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" @@ -38,8 +38,8 @@ in this Software without prior written authorization from The Open Group. #include "servermd.h" #include "swapreq.h" #define _XCUP_SERVER_ -#include "Xcupstr.h" -#include "Xfuncproto.h" +#include <X11/extensions/Xcupstr.h> +#include <X11/Xfuncproto.h> #ifndef EXTMODULE #include "../os/osdep.h" diff --git a/Xext/dpms.c b/Xext/dpms.c index e04f3470d..de0ca6650 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -35,16 +35,16 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" #define DPMS_SERVER -#include "dpms.h" -#include "dpmsstr.h" +#include <X11/extensions/dpms.h> +#include <X11/extensions/dpmsstr.h> #include "dpmsproc.h" #include "modinit.h" diff --git a/Xext/fontcache.c b/Xext/fontcache.c index 2b7798f29..c45b00ffe 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -33,8 +33,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" @@ -44,7 +44,7 @@ #define _FONTCACHE_SERVER_ #include "fontcacheP.h" #include "fontcachstr.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include "swaprep.h" #include "modinit.h" diff --git a/Xext/mbuf.c b/Xext/mbuf.c index be08abea7..d8d73aa8e 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -28,8 +28,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "window.h" #include "os.h" #include "windowstr.h" @@ -42,7 +42,7 @@ in this Software without prior written authorization from The Open Group. #include "opaque.h" #include "sleepuntil.h" #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include "multibufst.h" +#include <X11/extensions/multibufst.h> #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index 3e6f9dc20..a9ba78b3a 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES #define NEED_EVENTS #include <stdio.h> -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "windowstr.h" @@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group. #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_BUFFER_ -#include "multibufst.h" +#include <X11/extensions/multibufst.h> /* Support for doublebuffer hardare diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index 6c3e8be6b..11c997b79 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES #define NEED_EVENTS #include <stdio.h> -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "windowstr.h" @@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_PIXMAP_ -#include "multibufst.h" +#include <X11/extensions/multibufst.h> static Bool NoopDDA_True() { return TRUE; } diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index 8fd6c3646..c2a27e0f6 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -30,14 +30,14 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #define _MITMISC_SERVER_ -#include "mitmiscstr.h" +#include <X11/extensions/mitmiscstr.h> #include "modinit.h" extern Bool permitOldBugs; diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 90afc2b3d..67cb7c943 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -27,9 +27,9 @@ Equipment Corporation. #define NEED_REPLIES #include <stdio.h> -#include "X.h" -#include "Xproto.h" -#include "Xarch.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xarch.h> #include "misc.h" #include "cursor.h" #include "cursorstr.h" @@ -42,7 +42,7 @@ Equipment Corporation. #include "windowstr.h" #include "pixmapstr.h" #include "panoramiX.h" -#include "panoramiXproto.h" +#include <X11/extensions/panoramiXproto.h> #include "panoramiXsrv.h" #include "globals.h" #include "servermd.h" diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index bc88c8b89..fb212fd00 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -1,5 +1,5 @@ /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.2 2004/04/23 18:44:41 eich Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. @@ -39,7 +39,7 @@ Equipment Corporation. #ifndef _PANORAMIX_H_ #define _PANORAMIX_H_ -#include "panoramiXext.h" +#include <X11/extensions/panoramiXext.h> #include "gcstruct.h" diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index b73827150..dcd9fc227 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -26,8 +26,8 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */ #include <stdio.h> -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "cursor.h" #include "cursorstr.h" @@ -44,7 +44,7 @@ Equipment Corporation. #include <X11/Xserver/ws.h> #endif #include "panoramiX.h" -#include "panoramiXproto.h" +#include <X11/extensions/panoramiXproto.h> #include "panoramiXsrv.h" #include "globals.h" #include "panoramiXh.h" diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 6c76a309f..0b95af6af 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -29,10 +29,10 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */ #include <stdio.h> -#include "X.h" +#include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #include "windowstr.h" #include "dixfontstr.h" #include "gcstruct.h" diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index 4f23ca383..a3d137619 100644 --- a/Xext/sampleEVI.c +++ b/Xext/sampleEVI.c @@ -23,13 +23,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include "XEVIstr.h" +#include <X11/extensions/XEVIstr.h> #include "EVIstruct.h" #include "scrnintstr.h" static int sampleGetVisualInfo( diff --git a/Xext/saver.c b/Xext/saver.c index 0c725421d..23c40bc37 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.4 2004/11/01 16:05:27 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.6 2005/03/23 21:09:48 herrb Exp $ */ /* * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ * @@ -32,8 +32,8 @@ in this Software without prior written authorization from the X Consortium. #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "windowstr.h" @@ -43,7 +43,7 @@ in this Software without prior written authorization from the X Consortium. #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#include "saverproto.h" +#include <X11/extensions/saverproto.h> #include "gcstruct.h" #include "cursorstr.h" #include "colormapst.h" diff --git a/Xext/security.c b/Xext/security.c index b46733823..736598faa 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,4 +1,4 @@ -/* $XdotOrg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */ /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* @@ -36,19 +36,19 @@ in this Software without prior written authorization from The Open Group. #include "colormapst.h" #include "propertyst.h" #define _SECURITY_SERVER -#include "securstr.h" +#include <X11/extensions/securstr.h> #include <assert.h> #include <stdarg.h> #ifdef LBX #define _XLBX_SERVER_ -#include "XLbx.h" +#include <X11/extensions/XLbx.h> extern unsigned char LbxReqCode; #endif #ifdef XAPPGROUP -#include "Xagsrv.h" +#include <X11/extensions/Xagsrv.h> #endif #include <stdio.h> /* for file reading operations */ -#include "Xatom.h" /* for XA_STRING */ +#include <X11/Xatom.h> /* for XA_STRING */ #ifndef DEFAULTPOLICYFILE # define DEFAULTPOLICYFILE NULL diff --git a/Xext/shape.c b/Xext/shape.c index 91758a1e4..1e8cdb1bd 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.3 2004/07/29 18:46:37 stukreit Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.4 2004/07/29 23:43:39 kem Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ @@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "windowstr.h" @@ -41,7 +41,7 @@ in this Software without prior written authorization from The Open Group. #include "resource.h" #include "opaque.h" #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include "shapestr.h" +#include <X11/extensions/shapestr.h> #include "regionstr.h" #include "gcstruct.h" #ifdef EXTMODULE diff --git a/Xext/shm.c b/Xext/shm.c index 29eab06f5..474020eb1 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -43,8 +43,8 @@ in this Software without prior written authorization from The Open Group. #include <sys/stat.h> #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -56,8 +56,8 @@ in this Software without prior written authorization from The Open Group. #include "extnsionst.h" #include "servermd.h" #define _XSHM_SERVER_ -#include "shmstr.h" -#include "Xfuncproto.h" +#include <X11/extensions/shmstr.h> +#include <X11/Xfuncproto.h> #ifdef EXTMODULE #include "xf86_ansic.h" #endif diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 891522431..20f3a1f96 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. /* dixsleep.c - implement millisecond timeouts for X clients */ #include "sleepuntil.h" -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "windowstr.h" #include "dixstruct.h" diff --git a/Xext/sync.c b/Xext/sync.c index 62636a0c7..2e4d247f0 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -54,9 +54,9 @@ PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xmd.h> #include "misc.h" #include "os.h" #include "extnsionst.h" @@ -64,8 +64,8 @@ PERFORMANCE OF THIS SOFTWARE. #include "resource.h" #include "opaque.h" #define _SYNC_SERVER -#include "sync.h" -#include "syncstr.h" +#include <X11/extensions/sync.h> +#include <X11/extensions/syncstr.h> #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 7c9348c0f..9b3780774 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -30,14 +30,14 @@ from The Open Group. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include "xcmiscstr.h" +#include <X11/extensions/xcmiscstr.h> #include "modinit.h" #if 0 diff --git a/Xext/xevie.c b/Xext/xevie.c index b024a622a..f435e79e2 100644 --- a/Xext/xevie.c +++ b/Xext/xevie.c @@ -33,8 +33,8 @@ of the copyright holder. #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" @@ -43,7 +43,7 @@ of the copyright holder. #include "servermd.h" #define _XEVIE_SERVER_ #include "Xeviestr.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include "input.h" #include "../os/osdep.h" diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index bcabaefa7..79a4c59e5 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -60,8 +60,8 @@ #include <errno.h> #endif -#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/Xext/xprint.c b/Xext/xprint.c index 96e2ca078..14790d6f7 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -67,10 +67,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */ #define _XP_PRINT_SERVER_ -#include "X.h" -#include "Xos.h" +#include <X11/X.h> +#include <X11/Xos.h> #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #undef NEED_EVENTS #include "misc.h" #include "windowstr.h" @@ -78,7 +78,7 @@ copyright holders. #include "pixmapstr.h" #include "extnsionst.h" #include "dixstruct.h" -#include "Xatom.h" +#include <X11/Xatom.h> #include "Print.h" #include "Printstr.h" #include "../Xprint/DiPrint.h" diff --git a/Xext/xres.c b/Xext/xres.c index 6454f9eed..ca6e5bbc3 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -2,18 +2,18 @@ Copyright (c) 2002 XFree86 Inc */ /* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */ -/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.3 2004/12/15 20:51:25 herrb Exp $ */ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include "XResproto.h" +#include <X11/extensions/XResproto.h> #include "pixmapstr.h" #include "modinit.h" diff --git a/Xext/xtest.c b/Xext/xtest.c index 3635b3898..7e81ce53d 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* @@ -29,9 +29,9 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -42,11 +42,11 @@ from The Open Group. #include "dixevents.h" #include "sleepuntil.h" #define _XTEST_SERVER_ -#include "XTest.h" -#include "xteststr.h" +#include <X11/extensions/XTest.h> +#include <X11/extensions/xteststr.h> #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #define EXTENSION_EVENT_BASE 64 #include "extinit.h" /* LookupDeviceIntRec */ #endif /* XINPUT */ diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c index 96e680832..686ff72df 100644 --- a/Xext/xtest1dd.c +++ b/Xext/xtest1dd.c @@ -62,14 +62,14 @@ University of California. #define NEED_REPLIES #include <stdio.h> -#include "Xos.h" -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/Xos.h> +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #define XTestSERVER_SIDE -#include "xtestext1.h" +#include <X11/extensions/xtestext1.h> #include "xtest1dd.h" diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c index 516b7b3c0..b6fb36ff1 100644 --- a/Xext/xtest1di.c +++ b/Xext/xtest1di.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ /* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* * File: xtest1di.c @@ -63,8 +63,8 @@ University of California. #define NEED_REPLIES #include <stdio.h> -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "gcstruct.h" @@ -72,7 +72,7 @@ University of California. #include "dixstruct.h" #include "opaque.h" #define XTestSERVER_SIDE -#include "xtestext1.h" +#include <X11/extensions/xtestext1.h> #include "modinit.h" #include "xtest1dd.h" diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index f98168c99..b96565c68 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -48,8 +48,8 @@ SOFTWARE. ** */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "scrnintstr.h" #include "windowstr.h" @@ -59,12 +59,12 @@ SOFTWARE. #include "resource.h" #include "opaque.h" -#include "Xv.h" -#include "Xvproto.h" +#include <X11/extensions/Xv.h> +#include <X11/extensions/Xvproto.h> #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include "shmstr.h" +#include <X11/extensions/shmstr.h> #endif #ifdef EXTMODULE diff --git a/Xext/xvdix.h b/Xext/xvdix.h index d4bff69ad..99d918406 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -54,7 +54,7 @@ SOFTWARE. */ #include "scrnintstr.h" -#include "Xvproto.h" +#include <X11/extensions/Xvproto.h> extern int XvScreenIndex; extern unsigned long XvExtensionGeneration; diff --git a/Xext/xvmain.c b/Xext/xvmain.c index e95bbe390..00406373e 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -75,8 +75,8 @@ SOFTWARE. ** */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "scrnintstr.h" @@ -91,8 +91,8 @@ SOFTWARE. #define GLOBAL -#include "Xv.h" -#include "Xvproto.h" +#include <X11/extensions/Xv.h> +#include <X11/extensions/Xvproto.h> #include "xvdix.h" #ifdef EXTMODULE diff --git a/Xext/xvmc.c b/Xext/xvmc.c index e37ee7c38..e533393df 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -2,8 +2,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 "os.h" #include "dixstruct.h" @@ -11,11 +11,11 @@ #include "scrnintstr.h" #include "extnsionst.h" #include "servermd.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include "xvdix.h" -#include "XvMC.h" -#include "Xvproto.h" -#include "XvMCproto.h" +#include <X11/extensions/XvMC.h> +#include <X11/extensions/Xvproto.h> +#include <X11/extensions/XvMCproto.h> #include "xvmcext.h" #ifdef HAS_XVMCSHM diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index ffa85e112..c7eba30ad 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -2,7 +2,7 @@ #ifndef _XVMC_H #define _XVMC_H -#include "Xv.h" +#include <X11/extensions/Xv.h> #include "xvdix.h" typedef struct { diff --git a/Xi/allowev.c b/Xi/allowev.c index cca0caaef..3d0c6b7ed 100644 --- a/Xi/allowev.c +++ b/Xi/allowev.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 91761a39d..6525546a1 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" /* control constants */ +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> /* control constants */ #include "XIstubs.h" #include "extnsionst.h" diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c index d00bf5392..a7228c02d 100644 --- a/Xi/chgfctl.c +++ b/Xi/chgfctl.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" /* control constants */ +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> /* control constants */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c index 1aef44045..1e6c78060 100644 --- a/Xi/chgkbd.c +++ b/Xi/chgkbd.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "globals.h" #include "extnsionst.h" diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index 7d411f181..82d4743e9 100644 --- a/Xi/chgkmap.c +++ b/Xi/chgkmap.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/Xi/chgprop.c b/Xi/chgprop.c index 7d1e14171..7f2f2cc00 100644 --- a/Xi/chgprop.c +++ b/Xi/chgprop.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/chgptr.c b/Xi/chgptr.c index 0fce98473..3fca66019 100644 --- a/Xi/chgptr.c +++ b/Xi/chgptr.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ diff --git a/Xi/closedev.c b/Xi/closedev.c index 71eb04332..49e292235 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -55,13 +55,13 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/devbell.c b/Xi/devbell.c index 6d3fcce53..7c3b68eff 100644 --- a/Xi/devbell.c +++ b/Xi/devbell.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/exevents.c b/Xi/exevents.c index ec07f443a..9c1ea01d9 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -55,10 +55,10 @@ SOFTWARE. */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "XI.h" -#include "XIproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "inputstr.h" #include "windowstr.h" #include "miscstruct.h" diff --git a/Xi/extinit.c b/Xi/extinit.c index 60fd885ca..ae110438a 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -57,13 +57,13 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "inputstr.h" #include "gcstruct.h" /* pointer for extnsionst.h*/ #include "extnsionst.h" /* extension entry */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "dixevents.h" #include "exevents.h" diff --git a/Xi/getbmap.c b/Xi/getbmap.c index febfa0293..cdfa05bb8 100644 --- a/Xi/getbmap.c +++ b/Xi/getbmap.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/getdctl.c b/Xi/getdctl.c index e7a3a8050..3a903b72e 100644 --- a/Xi/getdctl.c +++ b/Xi/getdctl.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/getfctl.c b/Xi/getfctl.c index 94f1bc4a1..2f41bcf70 100644 --- a/Xi/getfctl.c +++ b/Xi/getfctl.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/getfocus.c b/Xi/getfocus.c index e29b54ad6..d72cc7047 100644 --- a/Xi/getfocus.c +++ b/Xi/getfocus.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/getkmap.c b/Xi/getkmap.c index cd9d00c43..32436a439 100644 --- a/Xi/getkmap.c +++ b/Xi/getkmap.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/getmmap.c b/Xi/getmmap.c index 5fe62fcce..c44206899 100644 --- a/Xi/getmmap.c +++ b/Xi/getmmap.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" /* Request macro */ +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> /* Request macro */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/getprop.c b/Xi/getprop.c index 88655322f..45b03f6a8 100644 --- a/Xi/getprop.c +++ b/Xi/getprop.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structs */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/getselev.c b/Xi/getselev.c index 61ee1091d..b0408d8eb 100644 --- a/Xi/getselev.c +++ b/Xi/getselev.c @@ -55,10 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ -#include "XI.h" -#include "XIproto.h" +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window struct */ #include "extnsionst.h" diff --git a/Xi/getvers.c b/Xi/getvers.c index 638548e60..46c2c2567 100644 --- a/Xi/getvers.c +++ b/Xi/getvers.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/grabdev.c b/Xi/grabdev.c index 565d4d19d..ea265ea81 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -56,12 +56,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index e4a3dfd30..cc6ffc6c8 100644 --- a/Xi/grabdevb.c +++ b/Xi/grabdevb.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c index 6366884ba..14ecb61bb 100644 --- a/Xi/grabdevk.c +++ b/Xi/grabdevk.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index f22785fd4..f02096586 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/Xi/listdev.c b/Xi/listdev.c index f95d60d25..6d00f46ef 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/opendev.c b/Xi/opendev.c index c2a07aaff..4f9c2b63a 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "extnsionst.h" diff --git a/Xi/queryst.c b/Xi/queryst.c index 240c3a610..4cc56dd4d 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -36,12 +36,12 @@ from The Open Group. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/Xi/selectev.c b/Xi/selectev.c index 11f206cc8..bf92cfa58 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -56,12 +56,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/Xi/sendexev.c b/Xi/sendexev.c index aa9146176..5f87298a2 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -56,12 +56,12 @@ SOFTWARE. #define EXTENSION_EVENT_BASE 64 #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* Window */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" diff --git a/Xi/setbmap.c b/Xi/setbmap.c index cc7c0fbb2..7282a02e2 100644 --- a/Xi/setbmap.c +++ b/Xi/setbmap.c @@ -58,11 +58,11 @@ SOFTWARE. #define IsOn(ptr, bit) \ (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))) -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/setdval.c b/Xi/setdval.c index 2704775ae..4bfc541c7 100644 --- a/Xi/setdval.c +++ b/Xi/setdval.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/setfocus.c b/Xi/setfocus.c index 6e57ad268..c68142e69 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "dixevents.h" diff --git a/Xi/setmmap.c b/Xi/setmmap.c index 7af5e1037..6ed18e01a 100644 --- a/Xi/setmmap.c +++ b/Xi/setmmap.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/setmode.c b/Xi/setmode.c index 2eff821e7..37bc2b357 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ diff --git a/Xi/stubs.c b/Xi/stubs.c index d1b9f285c..8f10bd02c 100644 --- a/Xi/stubs.c +++ b/Xi/stubs.c @@ -58,11 +58,11 @@ SOFTWARE. */ #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/Xi/ungrdev.c b/Xi/ungrdev.c index 7a3c680bc..5f6ecf9e2 100644 --- a/Xi/ungrdev.c +++ b/Xi/ungrdev.c @@ -55,11 +55,11 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XIproto.h" +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c index a03979dcf..2b2288f1e 100644 --- a/Xi/ungrdevb.c +++ b/Xi/ungrdevb.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index 2bf25248c..621ba4ddf 100644 --- a/Xi/ungrdevk.c +++ b/Xi/ungrdevk.c @@ -55,12 +55,12 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" diff --git a/Xprint/Init.c b/Xprint/Init.c index 3bfc62ee8..6ebc220dd 100644 --- a/Xprint/Init.c +++ b/Xprint/Init.c @@ -65,9 +65,9 @@ copyright holders. #include <sys/sysmacros.h> #endif -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS 1 -#include "Xproto.h" +#include <X11/Xproto.h> #include <servermd.h> #include "screenint.h" diff --git a/Xprint/Oid.h b/Xprint/Oid.h index 70bd8d3e5..40bf79d07 100644 --- a/Xprint/Oid.h +++ b/Xprint/Oid.h @@ -34,7 +34,7 @@ copyright holders. #ifndef _Xp_Oid_h #define _Xp_Oid_h -#include <Xproto.h> +#include <X11/Xproto.h> /* * include the auto-generated XpOid enum definition diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c index 983e5c1c4..4b5aba2a8 100644 --- a/Xprint/ValTree.c +++ b/Xprint/ValTree.c @@ -32,7 +32,7 @@ copyright holders. */ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" diff --git a/Xprint/attributes.c b/Xprint/attributes.c index 5abc5f5d7..b015d648d 100644 --- a/Xprint/attributes.c +++ b/Xprint/attributes.c @@ -45,7 +45,7 @@ copyright holders. ** ********************************************************************/ -#include <Xproto.h> +#include <X11/Xproto.h> #include <string.h> #include <stdlib.h> #include <sys/wait.h> diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 6214c4ae5..2bbdde3ae 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -31,9 +31,9 @@ dealings in this Software without prior written authorization from said copyright holders. */ -#include "X.h" -#include "Xos.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xos.h> +#include <X11/Xproto.h> #include "windowstr.h" #include "servermd.h" #include "DiPrint.h" @@ -283,8 +283,8 @@ ddxProcessArgument ( #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> #include "XIstubs.h" extern int BadDevice; diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c index 12482b281..ea5000451 100644 --- a/Xprint/mediaSizes.c +++ b/Xprint/mediaSizes.c @@ -55,7 +55,7 @@ copyright holders. #include <string.h> #include <locale.h> -#include "X.h" +#include <X11/X.h> #include "dixstruct.h" #include "screenint.h" #include "misc.h" diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c index f48ece041..3d0a731ac 100644 --- a/Xprint/pcl/PclInit.c +++ b/Xprint/pcl/PclInit.c @@ -86,7 +86,7 @@ copyright holders. #include "Pcl.h" #include "cfb.h" -#include "Xos.h" /* for unlink() */ +#include <X11/Xos.h> /* for unlink() */ #include "attributes.h" #include "DiPrint.h" diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c index 63caa0fe5..9405a4e78 100644 --- a/Xprint/pcl/PclMisc.c +++ b/Xprint/pcl/PclMisc.c @@ -50,7 +50,7 @@ copyright holders. #include <signal.h> #include <sys/types.h> #include <sys/wait.h> -#include "Xos.h" /* for SIGCLD on pre-POSIX systems */ +#include <X11/Xos.h> /* for SIGCLD on pre-POSIX systems */ #include "Pcl.h" #include "cursor.h" diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c index 70c788eac..663086266 100644 --- a/Xprint/pcl/PclPrint.c +++ b/Xprint/pcl/PclPrint.c @@ -54,7 +54,7 @@ copyright holders. #include <X11/Xprotostr.h> #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #undef NEED_EVENTS #include "Pcl.h" diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c index 9ef4c505f..a7f37be56 100644 --- a/Xprint/pcl/PclText.c +++ b/Xprint/pcl/PclText.c @@ -54,7 +54,7 @@ copyright holders. #include "Pcl.h" #include "migc.h" -#include "Xatom.h" +#include <X11/Xatom.h> #include "PclSFonts.h" diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c index 86d862ce1..a4c585f0d 100644 --- a/Xprint/ps/PsMisc.c +++ b/Xprint/ps/PsMisc.c @@ -74,7 +74,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ -#include "Xos.h" /* for SIGCLD on pre-POSIX systems */ +#include <X11/Xos.h> /* for SIGCLD on pre-POSIX systems */ #include <stdio.h> #include "Ps.h" diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c index f0356d705..721e430ae 100644 --- a/Xprint/ps/PsPrint.c +++ b/Xprint/ps/PsPrint.c @@ -84,7 +84,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xprotostr.h> #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #undef NEED_EVENTS #include "Ps.h" diff --git a/Xprint/ps/psout_ft.c b/Xprint/ps/psout_ft.c index 914e2e57b..9db8d49ec 100644 --- a/Xprint/ps/psout_ft.c +++ b/Xprint/ps/psout_ft.c @@ -31,7 +31,7 @@ THE SOFTWARE. #include FT_FREETYPE_H #include FT_TYPE1_TABLES_H -#include "Xproto.h" +#include <X11/Xproto.h> #include "font.h" #include "fontstruct.h" #include "fntfilst.h" diff --git a/Xprint/ps/psout_ftpstype1.c b/Xprint/ps/psout_ftpstype1.c index a9b0cfe86..1d2f49ac7 100644 --- a/Xprint/ps/psout_ftpstype1.c +++ b/Xprint/ps/psout_ftpstype1.c @@ -34,7 +34,7 @@ THE SOFTWARE. #include <ft2build.h> #include FT_FREETYPE_H -#include "Xproto.h" +#include <X11/Xproto.h> #include "font.h" #include "fontstruct.h" #include "fntfilst.h" diff --git a/Xprint/ps/psout_ftpstype3.c b/Xprint/ps/psout_ftpstype3.c index bceb1d479..74494ab9a 100644 --- a/Xprint/ps/psout_ftpstype3.c +++ b/Xprint/ps/psout_ftpstype3.c @@ -58,7 +58,7 @@ THE SOFTWARE. #include FT_INTERNAL_OBJECTS_H #endif /* USE_FT_INTERNALS */ -#include "Xproto.h" +#include <X11/Xproto.h> #include "font.h" #include "fontstruct.h" #include "fntfilst.h" diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c index c8dfad1e3..2d16e3791 100644 --- a/Xprint/raster/Raster.c +++ b/Xprint/raster/Raster.c @@ -56,12 +56,12 @@ copyright holders. #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> -#include "X.h" -#include "Xos.h" /* for SIGCLD on pre-POSIX systems */ +#include <X11/X.h> +#include <X11/Xos.h> /* for SIGCLD on pre-POSIX systems */ #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #undef NEED_EVENTS -#include "Xatom.h" +#include <X11/Xatom.h> #include "misc.h" #include "dixstruct.h" #include "scrnintstr.h" diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h index 9b335743f..4819dcb8b 100644 --- a/Xprint/raster/Raster.h +++ b/Xprint/raster/Raster.h @@ -58,7 +58,7 @@ typedef char *XPointer; #define True 1 #define False 0 #include "misc.h" -#include <Xfuncproto.h> +#include <X11/Xfuncproto.h> #include <X11/Xresource.h> #include "attributes.h" diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c index 4527ba8db..86ab1d41b 100644 --- a/Xprint/raster/RasterAttVal.c +++ b/Xprint/raster/RasterAttVal.c @@ -33,7 +33,7 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ #include <stdio.h> -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "dixstruct.h" #include "scrnintstr.h" diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c index b07216899..b7ec21dfa 100644 --- a/afb/afbbitblt.c +++ b/afb/afbbitblt.c @@ -49,8 +49,8 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" diff --git a/afb/afbblt.c b/afb/afbblt.c index 13a56e521..11c791921 100644 --- a/afb/afbblt.c +++ b/afb/afbblt.c @@ -33,9 +33,9 @@ Author: Keith Packard */ /* $XConsortium: afbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "afb.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbbres.c b/afb/afbbres.c index d09a47485..87b598a42 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -49,7 +49,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "afb.h" #include "maskbits.h" diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 0b0d5d6fe..fd8b88c00 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "afb.h" #include "maskbits.h" diff --git a/afb/afbbstore.c b/afb/afbbstore.c index c3e844d57..050177ecf 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -32,7 +32,7 @@ from the X Consortium. */ #include "afb.h" -#include "X.h" +#include <X11/X.h> #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/afb/afbclip.c b/afb/afbclip.c index 3930342d9..2d4385806 100644 --- a/afb/afbclip.c +++ b/afb/afbclip.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/afb/afbcmap.c b/afb/afbcmap.c index cfa41aab3..c43725aa4 100644 --- a/afb/afbcmap.c +++ b/afb/afbcmap.c @@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c index e13c7948a..60d7d758c 100644 --- a/afb/afbfillarc.c +++ b/afb/afbfillarc.c @@ -28,8 +28,8 @@ in this Software without prior written authorization from the X Consortium. /* $XConsortium: afbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c index b5e6802d2..83863a0a7 100644 --- a/afb/afbfillrct.c +++ b/afb/afbfillrct.c @@ -49,8 +49,8 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c index 647641d7d..3af84e6bf 100644 --- a/afb/afbfillsp.c +++ b/afb/afbfillsp.c @@ -49,8 +49,8 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" diff --git a/afb/afbfont.c b/afb/afbfont.c index 5df6691c5..8b1c95783 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -48,9 +48,9 @@ SOFTWARE. */ /* $XConsortium: afbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "afb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/afb/afbgc.c b/afb/afbgc.c index 4ce893902..cfd9abdc9 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -48,9 +48,9 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "afb.h" #include "dixfontstr.h" #include "fontstruct.h" diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c index 26ed5ba60..051544505 100644 --- a/afb/afbgetsp.c +++ b/afb/afbgetsp.c @@ -49,8 +49,8 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "region.h" diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c index 3578b2892..6f27c2540 100644 --- a/afb/afbhrzvert.c +++ b/afb/afbhrzvert.c @@ -49,7 +49,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gc.h" #include "window.h" diff --git a/afb/afbimage.c b/afb/afbimage.c index 52553f55a..c5225cf9b 100644 --- a/afb/afbimage.c +++ b/afb/afbimage.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c index 8f7509df5..3444b4eec 100644 --- a/afb/afbimggblt.c +++ b/afb/afbimggblt.c @@ -49,9 +49,9 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "afb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/afb/afbline.c b/afb/afbline.c index 9e9065705..6d59ee3b6 100644 --- a/afb/afbline.c +++ b/afb/afbline.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbmisc.c b/afb/afbmisc.c index 4928a84d3..31d3a6a75 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "cursor.h" #include "scrnintstr.h" diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c index 23b51d539..3d1245125 100644 --- a/afb/afbpixmap.c +++ b/afb/afbpixmap.c @@ -54,7 +54,7 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "maskbits.h" diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c index 3156b0617..d1c714753 100644 --- a/afb/afbply1rct.c +++ b/afb/afbply1rct.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from the X Consortium. * Author: Keith Packard, MIT X Consortium */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c index 26d87868a..774f83799 100644 --- a/afb/afbplygblt.c +++ b/afb/afbplygblt.c @@ -49,9 +49,9 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "afb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c index c552b388a..ab3031b92 100644 --- a/afb/afbpntarea.c +++ b/afb/afbpntarea.c @@ -49,7 +49,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index bb84e676a..ee652b244 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -49,7 +49,7 @@ SOFTWARE. ******************************************************************/ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c index f1ff5bb41..8ae40e091 100644 --- a/afb/afbpolypnt.c +++ b/afb/afbpolypnt.c @@ -49,8 +49,8 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbpolypnt.c,v 5.6 94/04/17 20:28:30 dpw Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c index 026d09c21..c8b123b95 100644 --- a/afb/afbpushpxl.c +++ b/afb/afbpushpxl.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c index d947825e2..6e82c9d60 100644 --- a/afb/afbscrinit.c +++ b/afb/afbscrinit.c @@ -48,9 +48,9 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */ -#include "X.h" -#include "Xproto.h" /* for xColorItem */ -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xproto.h> /* for xColorItem */ +#include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c index a4ea4d3ac..0410606f3 100644 --- a/afb/afbsetsp.c +++ b/afb/afbsetsp.c @@ -49,8 +49,8 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "regionstr.h" diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c index a544f9aa9..5159cda8f 100644 --- a/afb/afbtegblt.c +++ b/afb/afbtegblt.c @@ -49,9 +49,9 @@ SOFTWARE. ******************************************************************/ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "afb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/afb/afbtile.c b/afb/afbtile.c index b4376d18c..3dc543dbe 100644 --- a/afb/afbtile.c +++ b/afb/afbtile.c @@ -49,7 +49,7 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/afb/afbwindow.c b/afb/afbwindow.c index b6037d8cb..678c8f1b9 100644 --- a/afb/afbwindow.c +++ b/afb/afbwindow.c @@ -49,7 +49,7 @@ SOFTWARE. ******************************************************************/ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "afb.h" diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c index ae9136f70..645ac8f4c 100644 --- a/afb/afbzerarc.c +++ b/afb/afbzerarc.c @@ -34,8 +34,8 @@ in this Software without prior written authorization from the X Consortium. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) -#include "X.h" +#include <X11/X.h> #include "globals.h" #include "pixmap.h" #include "region.h" diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c index 3309fb764..4d10cb0ce 100644 --- a/cfb/cfb8bit.c +++ b/cfb/cfb8bit.c @@ -37,9 +37,9 @@ from The Open Group. #if PSZ == 8 -#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/cfb/cfb8line.c b/cfb/cfb8line.c index 6f8f896b8..74e10cc03 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c index 8da0c1c7b..4739589d8 100644 --- a/cfb/cfballpriv.c +++ b/cfb/cfballpriv.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi 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/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index b822de61e..0a68c0712 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -33,9 +33,9 @@ Author: Keith Packard */ /* $Xorg: cfbbitblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#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/cfb/cfbblt.c b/cfb/cfbblt.c index 7f4e3e10f..06e271640 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -34,9 +34,9 @@ Author: Keith Packard /* 24-bit bug fixes: Peter Wainwright, 1998/11/28 */ -#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/cfb/cfbbres.c b/cfb/cfbbres.c index b306ee80b..85cd906fa 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "cfb.h" #include "cfbmskbits.h" diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index 4f6630ab3..fd4144f40 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "cfb.h" #include "cfbmskbits.h" diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c index 19de06ad9..1ca165524 100644 --- a/cfb/cfbbstore.c +++ b/cfb/cfbbstore.c @@ -18,7 +18,7 @@ /* $Xorg: cfbbstore.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ #include "cfb.h" -#include "X.h" +#include <X11/X.h> #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index 1806916ff..7d7f39a0e 100644 --- a/cfb/cfbcmap.c +++ b/cfb/cfbcmap.c @@ -30,8 +30,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index 54360e95c..b2b53999b 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 01e4557d4..837067ff9 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbfillarc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c index 86258ed4f..4ea3177d1 100644 --- a/cfb/cfbfillrct.c +++ b/cfb/cfbfillrct.c @@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbfillrct.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index 6234694d6..d460fad1d 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -77,8 +77,8 @@ SOFTWARE. /* $Xorg: cfbfillsp.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index af739daa4..bd9efd20c 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -48,9 +48,9 @@ SOFTWARE. /* $Xorg: cfbgc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#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/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index 003be6dcc..f00e051a1 100644 --- a/cfb/cfbgetsp.c +++ b/cfb/cfbgetsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "misc.h" diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c index b850723df..290970a50 100644 --- a/cfb/cfbglblt8.c +++ b/cfb/cfbglblt8.c @@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group. * only. */ -#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/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c index 88b1e740f..408f60533 100644 --- a/cfb/cfbhrzvert.c +++ b/cfb/cfbhrzvert.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbhrzvert.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gc.h" #include "window.h" diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c index a40e995be..c0ea250f6 100644 --- a/cfb/cfbigblt8.c +++ b/cfb/cfbigblt8.c @@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mi.h" #include "cfb.h" #include "fontstruct.h" diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index 68b5cc68d..17166a396 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbimage.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 28b0cb8c5..8fec8fbd0 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbline.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c index 5bc759d01..cc21efc35 100644 --- a/cfb/cfbmskbits.c +++ b/cfb/cfbmskbits.c @@ -48,8 +48,8 @@ bit index 32-n in a longword see also cfbmskbits.h */ -#include <X.h> -#include <Xmd.h> +#include <X11/X.h> +#include <X11/Xmd.h> #include <servermd.h> #include "cfb.h" #include "cfbmskbits.h" diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index 5d5764c09..a803cac72 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -31,8 +31,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $Xorg: cfbmskbits.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ /* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #if defined(XFREE86) || ( defined(__OpenBSD__) && defined(__alpha__) ) \ || (defined(__bsdi__)) diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index 53ea34c45..46bd90f6f 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -52,7 +52,7 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index fa38f0cf4..5d2213682 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index 9f6cc78d2..f6050fc26 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.2 2004/04/23 19:00:12 eich Exp $ */ /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ /*********************************************************** @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c index a5886b6ec..607fc1b3c 100644 --- a/cfb/cfbpolypnt.c +++ b/cfb/cfbpolypnt.c @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbpolypnt.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c index 3f313b0e3..31643fe2e 100644 --- a/cfb/cfbpush8.c +++ b/cfb/cfbpush8.c @@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open Group. #if PSZ == 8 -#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/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c index ba8dd89f2..e8509b029 100644 --- a/cfb/cfbrctstp8.c +++ b/cfb/cfbrctstp8.c @@ -34,8 +34,8 @@ Author: Keith Packard, MIT X Consortium #if PSZ == 8 -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c index 3014b3a5a..909d03a9b 100644 --- a/cfb/cfbrrop.c +++ b/cfb/cfbrrop.c @@ -29,9 +29,9 @@ in this Software without prior written authorization from The Open Group. /* cfb reduced rasterop computations */ -#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 "cfbmskbits.h" diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h index a43bf1978..cfa3a93fa 100644 --- a/cfb/cfbrrop.h +++ b/cfb/cfbrrop.h @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */ #ifndef GXcopy -#include "X.h" +#include <X11/X.h> #endif #define RROP_FETCH_GC(gc) \ diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c index 2bc0befd3..2aae7d5a0 100644 --- a/cfb/cfbscrinit.c +++ b/cfb/cfbscrinit.c @@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $Xorg: cfbscrinit.c,v 1.3 2000/08/17 19:48:15 cpqbld 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/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index 8385fe35a..c41210380 100644 --- a/cfb/cfbsetsp.c +++ b/cfb/cfbsetsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "misc.h" diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c index f4e7f3385..1fd3acf02 100644 --- a/cfb/cfbsolid.c +++ b/cfb/cfbsolid.c @@ -28,8 +28,8 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c index 3e00393bf..2be72262e 100644 --- a/cfb/cfbteblt8.c +++ b/cfb/cfbteblt8.c @@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group. #if PSZ == 8 -#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/cfb/cfbtegblt.c b/cfb/cfbtegblt.c index ff7f3be57..8893479b3 100644 --- a/cfb/cfbtegblt.c +++ b/cfb/cfbtegblt.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */ -#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/cfb/cfbtile32.c b/cfb/cfbtile32.c index 1ba4bb16d..c9f64f15c 100644 --- a/cfb/cfbtile32.c +++ b/cfb/cfbtile32.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbtile32.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c index bd6a0b82c..dd5860894 100644 --- a/cfb/cfbtileodd.c +++ b/cfb/cfbtileodd.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbtileodd.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index 13148728c..2c5eada23 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "cfb.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index baa89f318..358658afc 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.2 2004/04/23 19:03:43 eich Exp $ */ /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * @@ -37,8 +37,8 @@ /* INCLUDES */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "extnsionst.h" #include "gcstruct.h" diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index f176c6fd1..13d09dea2 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -40,7 +40,7 @@ /* INCLUDES */ #define NEED_DBE_PROTOCOL -#include "Xdbeproto.h" +#include <X11/extensions/Xdbeproto.h> #include "windowstr.h" diff --git a/dbe/midbe.c b/dbe/midbe.c index bdf46b8ae..6083ad1a9 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -37,8 +37,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 "os.h" #include "windowstr.h" diff --git a/dix/atom.c b/dix/atom.c index 5a62ff083..c71b3bbc3 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -48,8 +48,8 @@ SOFTWARE. /* $Xorg: atom.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" -#include "Xatom.h" +#include <X11/X.h> +#include <X11/Xatom.h> #include "misc.h" #include "resource.h" #include "dix.h" diff --git a/dix/colormap.c b/dix/colormap.c index dc5dd405e..732267172 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.5 2004/08/13 08:16:14 keithp Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.6 2005/03/07 23:02:58 gisburn Exp $ */ /* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */ /*********************************************************** @@ -49,9 +49,9 @@ SOFTWARE. /* $Xorg: colormap.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #include "misc.h" #include "dix.h" #include "colormapst.h" diff --git a/dix/cursor.c b/dix/cursor.c index b269c4e8d..11b4629cf 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -49,8 +49,8 @@ SOFTWARE. /* $Xorg: cursor.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/dix/devices.c b/dix/devices.c index bfcd9133f..3bc098158 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -49,12 +49,12 @@ SOFTWARE. /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -63,11 +63,11 @@ SOFTWARE. #include "site.h" #define XKB_IN_SERVER #ifdef XKB -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index 2f24e6126..6a93dacbb 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.6 2004/09/15 09:05:22 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -105,15 +105,15 @@ int ProcInitialConnection(); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif #ifdef XAPPGROUP -#include "Xagsrv.h" +#include <X11/extensions/Xagsrv.h> #endif #ifdef XKB #define XKB_IN_SERVER #include "inputstr.h" -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 006d5141c..107b27cac 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.3 2005/03/07 23:02:58 gisburn Exp $ */ /* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -52,9 +52,9 @@ Equipment Corporation. /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ #define NEED_REPLIES -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "resource.h" #include "dixstruct.h" diff --git a/dix/dixutils.c b/dix/dixutils.c index 155636e91..26b7151a6 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -84,8 +84,8 @@ Author: Adobe Systems Incorporated /* $Xorg: dixutils.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "windowstr.h" #include "dixstruct.h" @@ -95,7 +95,7 @@ Author: Adobe Systems Incorporated #include "keysymdef.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif /* diff --git a/dix/events.c b/dix/events.c index 473a6c70c..d80b249bb 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.6 2004/08/09 02:08:35 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */ /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ /************************************************************ @@ -78,12 +78,12 @@ Equipment Corporation. /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "resource.h" #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" #include "scrnintstr.h" @@ -97,13 +97,13 @@ Equipment Corporation. #include "globals.h" #ifdef XKB -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif #ifdef XEVIE @@ -120,7 +120,7 @@ int xeviegrabState = 0; xEvent *xeviexE; #endif -#include "XIproto.h" +#include <X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" diff --git a/dix/extension.c b/dix/extension.c index ee8bcaa23..bbd179a8b 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -47,10 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: extension.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -59,7 +59,7 @@ SOFTWARE. #include "dispatch.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" @@ -48,9 +48,9 @@ SOFTWARE. /* $Xorg: gc.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#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 "resource.h" #include "gcstruct.h" diff --git a/dix/globals.c b/dix/globals.c index 23fbd1039..c7190f6c0 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.3 2004/09/22 17:20:55 alanc Exp $ */ /* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ /************************************************************ @@ -49,8 +49,8 @@ SOFTWARE. /* $Xorg: globals.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "windowstr.h" #include "scrnintstr.h" diff --git a/dix/grabs.c b/dix/grabs.c index 34482e561..5a767a641 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -48,10 +48,10 @@ SOFTWARE. */ /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" #include "cursorstr.h" diff --git a/dix/initatoms.c b/dix/initatoms.c index 7aadd909a..8253a7274 100644 --- a/dix/initatoms.c +++ b/dix/initatoms.c @@ -3,8 +3,8 @@ * Do not change! Changing this file implies a protocol change! */ -#include "X.h" -#include "Xatom.h" +#include <X11/X.h> +#include <X11/Xatom.h> #include "misc.h" #include "dix.h" void MakePredeclaredAtoms() diff --git a/dix/main.c b/dix/main.c index 504602ead..481a199e2 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.5 2005/03/07 23:02:58 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.6 2005/03/23 19:58:45 gisburn Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** @@ -80,9 +80,9 @@ Equipment Corporation. /* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */ #define NEED_EVENTS -#include "X.h" -#include "Xos.h" /* for unistd.h */ -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xos.h> /* for unistd.h */ +#include <X11/Xproto.h> #include "scrnintstr.h" #include "misc.h" #include "os.h" @@ -110,7 +110,7 @@ Equipment Corporation. #ifdef DPMSExtension #define DPMS_SERVER -#include "dpms.h" +#include <X11/extensions/dpms.h> #include "dpmsproc.h" #endif diff --git a/dix/pixmap.c b/dix/pixmap.c index bccc6b5cd..18e7b9394 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -28,7 +28,7 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "misc.h" #include "os.h" diff --git a/dix/privates.c b/dix/privates.c index ffc046a0b..1353e29aa 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -28,7 +28,7 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "misc.h" #include "os.h" diff --git a/dix/property.c b/dix/property.c index 9bdc7f7e9..dec5a91d8 100644 --- a/dix/property.c +++ b/dix/property.c @@ -47,10 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: property.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #include "windowstr.h" #include "propertyst.h" #include "dixstruct.h" @@ -58,7 +58,7 @@ SOFTWARE. #include "swaprep.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif #ifdef LBX #include "lbxserve.h" diff --git a/dix/resource.c b/dix/resource.c index 96dcec2cf..f0035f48a 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -74,7 +74,7 @@ Equipment Corporation. ******************************************************************/ /* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.3 2004/04/25 22:42:09 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.4 2005/03/07 23:02:58 gisburn Exp $ */ /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ /* Routines to manage various kinds of resources: @@ -102,7 +102,7 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */ #define NEED_EVENTS -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "os.h" #include "resource.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index 08e6d3c37..1c6da139f 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -48,10 +48,10 @@ SOFTWARE. /* $Xorg: swaprep.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS -#include "Xproto.h" +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "fontstruct.h" diff --git a/dix/swapreq.c b/dix/swapreq.c index 5baadf792..8f9036da1 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -48,10 +48,10 @@ SOFTWARE. /* $Xorg: swapreq.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS -#include "Xproto.h" -#include "Xprotostr.h" +#include <X11/Xproto.h> +#include <X11/Xprotostr.h> #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" /* for SendEvent */ diff --git a/dix/tables.c b/dix/tables.c index 6037b1220..092abd61f 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -47,10 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: tables.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "windowstr.h" #include "extnsionst.h" #include "dixstruct.h" diff --git a/dix/window.c b/dix/window.c index f77f612f4..27d3d05ec 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.6 2004/07/31 08:24:13 anholt Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.7 2005/03/07 23:02:59 gisburn Exp $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* @@ -101,11 +101,11 @@ Equipment Corporation. #include "globals.h" #ifdef XAPPGROUP -#include "Xagsrv.h" +#include <X11/extensions/Xagsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif /****** @@ -22,12 +22,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.7 2004/11/05 19:51:38 torrey Exp $ */ +/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.8 2004/12/04 00:42:50 kuhn Exp $ */ #ifndef _FB_H_ #define _FB_H_ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "pixmap.h" #include "pixmapstr.h" diff --git a/fb/fbcmap.c b/fb/fbcmap.c index 001277a1d..4eacd194b 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -30,8 +30,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c index c06233692..e93cf6419 100644 --- a/fb/fbpseudocolor.c +++ b/fb/fbpseudocolor.c @@ -1,5 +1,5 @@ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" 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" diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c index f861b93e9..ad944025e 100644 --- a/ilbm/ilbmbitblt.c +++ b/ilbm/ilbmbitblt.c @@ -52,8 +52,8 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "miscstruct.h" #include "regionstr.h" diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c index 286a82474..1f8434012 100644 --- a/ilbm/ilbmblt.c +++ b/ilbm/ilbmblt.c @@ -36,9 +36,9 @@ Author: Keith Packard /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ilbm.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c index 931da54fd..57142256d 100644 --- a/ilbm/ilbmbres.c +++ b/ilbm/ilbmbres.c @@ -52,7 +52,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "ilbm.h" #include "maskbits.h" diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c index 1cd456bb1..20d078f6a 100644 --- a/ilbm/ilbmbresd.c +++ b/ilbm/ilbmbresd.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "ilbm.h" #include "maskbits.h" diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c index 2a12a39bc..af72db549 100644 --- a/ilbm/ilbmbstore.c +++ b/ilbm/ilbmbstore.c @@ -35,7 +35,7 @@ from the X Consortium. to use interleaved bitplanes instead of normal bitplanes */ #include "ilbm.h" -#include "X.h" +#include <X11/X.h> #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/ilbm/ilbmclip.c b/ilbm/ilbmclip.c index 72d143e18..6aa654b17 100644 --- a/ilbm/ilbmclip.c +++ b/ilbm/ilbmclip.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "miscstruct.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c index 06da361e2..37bfcfd48 100644 --- a/ilbm/ilbmcmap.c +++ b/ilbm/ilbmcmap.c @@ -32,8 +32,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/ilbm/ilbmfillarc.c b/ilbm/ilbmfillarc.c index 28f2df91d..f61a01643 100644 --- a/ilbm/ilbmfillarc.c +++ b/ilbm/ilbmfillarc.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "miscstruct.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c index 4c2507487..734319240 100644 --- a/ilbm/ilbmfillrct.c +++ b/ilbm/ilbmfillrct.c @@ -52,8 +52,8 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c index f7fe90743..95eb220ac 100644 --- a/ilbm/ilbmfillsp.c +++ b/ilbm/ilbmfillsp.c @@ -52,8 +52,8 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c index 05e89bd8d..c39f0785d 100644 --- a/ilbm/ilbmfont.c +++ b/ilbm/ilbmfont.c @@ -51,9 +51,9 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ilbm.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c index 259935c46..646ed1646 100644 --- a/ilbm/ilbmgc.c +++ b/ilbm/ilbmgc.c @@ -51,9 +51,9 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ilbm.h" #include "dixfontstr.h" #include "fontstruct.h" diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c index e6adbae4a..121174fa2 100644 --- a/ilbm/ilbmgetsp.c +++ b/ilbm/ilbmgetsp.c @@ -52,8 +52,8 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "region.h" diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c index 277ac722a..7105e458b 100644 --- a/ilbm/ilbmhrzvert.c +++ b/ilbm/ilbmhrzvert.c @@ -52,7 +52,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "gc.h" #include "window.h" diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c index 348d593a3..ecaad9029 100644 --- a/ilbm/ilbmimage.c +++ b/ilbm/ilbmimage.c @@ -4,7 +4,7 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c index 24143fba3..b5802ae7d 100644 --- a/ilbm/ilbmimggblt.c +++ b/ilbm/ilbmimggblt.c @@ -52,9 +52,9 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ilbm.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c index 49dd7da46..5bf832a76 100644 --- a/ilbm/ilbmline.c +++ b/ilbm/ilbmline.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c index 9717aceca..c9aa4c792 100644 --- a/ilbm/ilbmmisc.c +++ b/ilbm/ilbmmisc.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "cursor.h" #include "scrnintstr.h" diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c index 01b991892..825b18267 100644 --- a/ilbm/ilbmpixmap.c +++ b/ilbm/ilbmpixmap.c @@ -57,7 +57,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "Xmd.h" +#include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "maskbits.h" diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c index 41d4545e4..6fdef5d4b 100644 --- a/ilbm/ilbmply1rct.c +++ b/ilbm/ilbmply1rct.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmplygblt.c b/ilbm/ilbmplygblt.c index fdd0a071f..173f7b985 100644 --- a/ilbm/ilbmplygblt.c +++ b/ilbm/ilbmplygblt.c @@ -52,9 +52,9 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ilbm.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c index 497eb50ee..77de2c480 100644 --- a/ilbm/ilbmpntarea.c +++ b/ilbm/ilbmpntarea.c @@ -52,7 +52,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c index 787955a87..4d4c45816 100644 --- a/ilbm/ilbmpntwin.c +++ b/ilbm/ilbmpntwin.c @@ -52,7 +52,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/ilbm/ilbmpolypnt.c b/ilbm/ilbmpolypnt.c index e35b85416..0dc6df674 100644 --- a/ilbm/ilbmpolypnt.c +++ b/ilbm/ilbmpolypnt.c @@ -52,8 +52,8 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c index 5bedef851..9f1b26ea2 100644 --- a/ilbm/ilbmpushpxl.c +++ b/ilbm/ilbmpushpxl.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c index f8b4eb52d..8fb1baa32 100644 --- a/ilbm/ilbmscrinit.c +++ b/ilbm/ilbmscrinit.c @@ -51,9 +51,9 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xproto.h" /* for xColorItem */ -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xproto.h> /* for xColorItem */ +#include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c index 55073817d..46bb3a262 100644 --- a/ilbm/ilbmsetsp.c +++ b/ilbm/ilbmsetsp.c @@ -52,8 +52,8 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "regionstr.h" diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c index 2c39ef7a9..0f6a8e535 100644 --- a/ilbm/ilbmtegblt.c +++ b/ilbm/ilbmtegblt.c @@ -52,9 +52,9 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ilbm.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/ilbm/ilbmtile.c b/ilbm/ilbmtile.c index d6e815405..4d9db06e9 100644 --- a/ilbm/ilbmtile.c +++ b/ilbm/ilbmtile.c @@ -52,7 +52,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c index fbf543de4..74944ea54 100644 --- a/ilbm/ilbmwindow.c +++ b/ilbm/ilbmwindow.c @@ -52,7 +52,7 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "ilbm.h" diff --git a/ilbm/ilbmzerarc.c b/ilbm/ilbmzerarc.c index 9ac30e267..f5a58ea5d 100644 --- a/ilbm/ilbmzerarc.c +++ b/ilbm/ilbmzerarc.c @@ -37,8 +37,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "miscstruct.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/include/closestr.h b/include/closestr.h index fcd64ed45..d70f754b2 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -33,7 +33,7 @@ from The Open Group. #define CLOSESTR_H #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "closure.h" #include "dix.h" #include "misc.h" diff --git a/include/colormap.h b/include/colormap.h index e8b235529..1f2c33075 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -50,7 +50,7 @@ SOFTWARE. #ifndef CMAP_H #define CMAP_H 1 -#include "X11/Xproto.h" +#include <X11/Xproto.h> #include "screenint.h" #include "window.h" diff --git a/include/dixfontstr.h b/include/dixfontstr.h index d1d0449dc..757b8bbc4 100644 --- a/include/dixfontstr.h +++ b/include/dixfontstr.h @@ -30,7 +30,7 @@ SOFTWARE. #include "fontstruct.h" #include "closure.h" #define NEED_REPLIES -#include "X11/Xproto.h" /* for xQueryFontReply */ +#include <X11/Xproto.h> /* for xQueryFontReply */ #define FONTCHARSET(font) (font) #define FONTMAXBOUNDS(font,field) (font)->info.maxbounds.field diff --git a/include/gc.h b/include/gc.h index 2288e8491..77c2f20c6 100644 --- a/include/gc.h +++ b/include/gc.h @@ -50,9 +50,9 @@ SOFTWARE. #ifndef GC_H #define GC_H -#include "X11/X.h" /* for GContext, Mask */ -#include "Xdefs.h" /* for Bool */ -#include "X11/Xproto.h" +#include <X11/X.h> /* for GContext, Mask */ +#include <X11/Xdefs.h> /* for Bool */ +#include <X11/Xproto.h> #include "screenint.h" /* for ScreenPtr */ #include "pixmap.h" /* for DrawablePtr */ diff --git a/include/gcstruct.h b/include/gcstruct.h index 6feff51f5..c2226ba17 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -58,7 +58,7 @@ SOFTWARE. #include "region.h" #include "pixmap.h" #include "screenint.h" -#include "Xprotostr.h" +#include <X11/Xprotostr.h> /* * functions which modify the state of the GC diff --git a/include/input.h b/include/input.h index 9bcdd9f58..bcaa01e6f 100644 --- a/include/input.h +++ b/include/input.h @@ -52,8 +52,8 @@ SOFTWARE. #include "misc.h" #include "screenint.h" -#include "X11/Xmd.h" -#include "X11/Xproto.h" +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "window.h" /* for WindowPtr */ #define DEVICE_INIT 0 diff --git a/include/miscstruct.h b/include/miscstruct.h index f0ff25b28..6a16007b7 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -51,7 +51,7 @@ SOFTWARE. #define MISCSTRUCT_H 1 #include "misc.h" -#include "X11/Xprotostr.h" +#include <X11/Xprotostr.h> #include "gc.h" typedef xPoint DDXPointRec; diff --git a/include/scrnintstr.h b/include/scrnintstr.h index edd14c12f..ef9358689 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -56,7 +56,7 @@ SOFTWARE. #include "colormap.h" #include "cursor.h" #include "validate.h" -#include "X11/Xproto.h" +#include <X11/Xproto.h> #include "dix.h" typedef struct _PixmapFormat { diff --git a/include/window.h b/include/window.h index 1a2845f90..7c3fce092 100644 --- a/include/window.h +++ b/include/window.h @@ -53,7 +53,7 @@ SOFTWARE. #include "misc.h" #include "region.h" #include "screenint.h" -#include "X11/Xproto.h" +#include <X11/Xproto.h> #define TOTALLY_OBSCURED 0 #define UNOBSCURED 1 diff --git a/include/windowstr.h b/include/windowstr.h index c89c7b18e..bce01ba97 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -58,7 +58,7 @@ SOFTWARE. #include "resource.h" /* for ROOT_WINDOW_ID_BASE */ #include "dix.h" #include "miscstruct.h" -#include "X11/Xprotostr.h" +#include <X11/Xprotostr.h> #include "opaque.h" #define GuaranteeNothing 0 diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h index cc4e519ce..d6cf45b14 100644 --- a/iplan2p4/ipl.h +++ b/iplan2p4/ipl.h @@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "pixmap.h" #include "region.h" #include "gc.h" diff --git a/iplan2p4/iplallpriv.c b/iplan2p4/iplallpriv.c index 11e358944..eadca0a01 100644 --- a/iplan2p4/iplallpriv.c +++ b/iplan2p4/iplallpriv.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#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/iplan2p4/iplbitblt.c b/iplan2p4/iplbitblt.c index 9105faa48..7c157aad6 100644 --- a/iplan2p4/iplbitblt.c +++ b/iplan2p4/iplbitblt.c @@ -36,9 +36,9 @@ Author: Keith Packard /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#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/iplan2p4/iplblt.c b/iplan2p4/iplblt.c index f303859cd..850ee5c43 100644 --- a/iplan2p4/iplblt.c +++ b/iplan2p4/iplblt.c @@ -36,9 +36,9 @@ Author: Keith Packard /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#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/iplan2p4/iplbres.c b/iplan2p4/iplbres.c index 47b895ea4..db92c6bc4 100644 --- a/iplan2p4/iplbres.c +++ b/iplan2p4/iplbres.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "ipl.h" #include "servermd.h" diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c index dd096dfbd..dd4afddda 100644 --- a/iplan2p4/iplbresd.c +++ b/iplan2p4/iplbresd.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "ipl.h" #include "miline.h" diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c index 422d10291..64874a407 100644 --- a/iplan2p4/iplbstore.c +++ b/iplan2p4/iplbstore.c @@ -25,7 +25,7 @@ static char rcsid[] = interleaved planes */ #include "ipl.h" -#include "X.h" +#include <X11/X.h> #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c index 3b73b1481..a6e8f2184 100644 --- a/iplan2p4/iplcmap.c +++ b/iplan2p4/iplcmap.c @@ -32,8 +32,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/iplan2p4/iplfillarc.c b/iplan2p4/iplfillarc.c index 50e4a81ab..62571114a 100644 --- a/iplan2p4/iplfillarc.c +++ b/iplan2p4/iplfillarc.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "miscstruct.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c index 7af2fa4fa..40b9d435c 100644 --- a/iplan2p4/iplfillrct.c +++ b/iplan2p4/iplfillrct.c @@ -34,8 +34,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c index 767db30cb..5bf0b0b50 100644 --- a/iplan2p4/iplfillsp.c +++ b/iplan2p4/iplfillsp.c @@ -81,8 +81,8 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c index 8a69cb7c8..925f34909 100644 --- a/iplan2p4/iplgc.c +++ b/iplan2p4/iplgc.c @@ -52,9 +52,9 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ipl.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c index 8ae61b6cc..7f742885b 100644 --- a/iplan2p4/iplgetsp.c +++ b/iplan2p4/iplgetsp.c @@ -51,8 +51,8 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "misc.h" diff --git a/iplan2p4/iplhrzvert.c b/iplan2p4/iplhrzvert.c index 1bcb57d57..621b55ba5 100644 --- a/iplan2p4/iplhrzvert.c +++ b/iplan2p4/iplhrzvert.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "gc.h" #include "window.h" diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c index 6c8e9ab73..644fd3c07 100644 --- a/iplan2p4/iplimage.c +++ b/iplan2p4/iplimage.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c index f59638693..19f230e07 100644 --- a/iplan2p4/iplline.c +++ b/iplan2p4/iplline.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h index 22f3b4d5f..bd3736759 100644 --- a/iplan2p4/iplmergerop.h +++ b/iplan2p4/iplmergerop.h @@ -18,7 +18,7 @@ interleaved planes */ */ #ifndef GXcopy -#include "X.h" +#include <X11/X.h> #endif typedef struct _mergeRopBits { diff --git a/iplan2p4/iplpixmap.c b/iplan2p4/iplpixmap.c index 7800e8d96..9a1e35852 100644 --- a/iplan2p4/iplpixmap.c +++ b/iplan2p4/iplpixmap.c @@ -56,7 +56,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "Xmd.h" +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/iplan2p4/iplply1rct.c b/iplan2p4/iplply1rct.c index fc73f2065..6d172a16b 100644 --- a/iplan2p4/iplply1rct.c +++ b/iplan2p4/iplply1rct.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/iplpntwin.c b/iplan2p4/iplpntwin.c index 88dbad6bf..d58d4bb1f 100644 --- a/iplan2p4/iplpntwin.c +++ b/iplan2p4/iplpntwin.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/iplan2p4/iplpolypnt.c b/iplan2p4/iplpolypnt.c index 763733a04..3bcd48360 100644 --- a/iplan2p4/iplpolypnt.c +++ b/iplan2p4/iplpolypnt.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c index 75ec557ee..dc3bad6a7 100644 --- a/iplan2p4/iplrrop.c +++ b/iplan2p4/iplrrop.c @@ -33,9 +33,9 @@ interleaved planes */ /* ipl reduced rasterop computations */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ipl.h" #include "iplmskbits.h" diff --git a/iplan2p4/iplscrinit.c b/iplan2p4/iplscrinit.c index 00dbef074..825d4f9d2 100644 --- a/iplan2p4/iplscrinit.c +++ b/iplan2p4/iplscrinit.c @@ -32,8 +32,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#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/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c index 52eefc31d..e71222614 100644 --- a/iplan2p4/iplsetsp.c +++ b/iplan2p4/iplsetsp.c @@ -51,8 +51,8 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "misc.h" diff --git a/iplan2p4/iplsolid.c b/iplan2p4/iplsolid.c index 447193b27..7875f7903 100644 --- a/iplan2p4/iplsolid.c +++ b/iplan2p4/iplsolid.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/iplan2p4/ipltegblt.c b/iplan2p4/ipltegblt.c index 8414bc7b2..167bc25a1 100644 --- a/iplan2p4/ipltegblt.c +++ b/iplan2p4/ipltegblt.c @@ -51,9 +51,9 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "ipl.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/iplan2p4/ipltile32.c b/iplan2p4/ipltile32.c index 6774de834..5a5e04080 100644 --- a/iplan2p4/ipltile32.c +++ b/iplan2p4/ipltile32.c @@ -35,8 +35,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/iplan2p4/ipltileodd.c b/iplan2p4/ipltileodd.c index abd4a3021..32ffadbe4 100644 --- a/iplan2p4/ipltileodd.c +++ b/iplan2p4/ipltileodd.c @@ -35,8 +35,8 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "gcstruct.h" #include "window.h" diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c index 8d95e284b..c8cd4c133 100644 --- a/iplan2p4/iplwindow.c +++ b/iplan2p4/iplwindow.c @@ -51,7 +51,7 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "ipl.h" diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c index 5c2c062b3..077a95a6e 100644 --- a/lbx/lbxcmap.c +++ b/lbx/lbxcmap.c @@ -30,9 +30,9 @@ from The Open Group. #include <sys/types.h> #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xos.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -41,9 +41,9 @@ from The Open Group. #include "colormapst.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "lbxserve.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include <stdio.h> static int lbxScreenPrivIndex; /* lbx screen private index */ diff --git a/lbx/lbxdata.h b/lbx/lbxdata.h index d5240f7ea..8b5343bfd 100644 --- a/lbx/lbxdata.h +++ b/lbx/lbxdata.h @@ -25,10 +25,10 @@ #ifndef _LBXDATA_H_ #define _LBXDATA_H_ #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "dixfontstr.h" extern int lbx_font_private; diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c index c392e6415..ac1d7bc8d 100644 --- a/lbx/lbxdix.c +++ b/lbx/lbxdix.c @@ -54,8 +54,8 @@ in this Software without prior written authorization from The Open Group. #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -68,13 +68,13 @@ in this Software without prior written authorization from The Open Group. #include "windowstr.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "lbxserve.h" #include "lbxtags.h" #include "lbxdata.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #ifdef XAPPGROUP -#include "Xagsrv.h" +#include <X11/extensions/Xagsrv.h> #endif #include "swaprep.h" diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c index 7ae70ebde..433482f4f 100644 --- a/lbx/lbxexts.c +++ b/lbx/lbxexts.c @@ -23,18 +23,18 @@ */ /* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "dixstruct.h" #include "colormapst.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "lbxserve.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include <X11/extensions/security.h> #endif typedef struct _lbxext { diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c index 5a468ecbf..8da2fd4eb 100644 --- a/lbx/lbxgfx.c +++ b/lbx/lbxgfx.c @@ -29,8 +29,8 @@ #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -39,11 +39,11 @@ #include "windowstr.h" #include "scrnintstr.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "lbxserve.h" #include "lbxtags.h" -#include "Xfuncproto.h" -#include "lbximage.h" +#include <X11/Xfuncproto.h> +#include <X11/extensions/lbximage.h> #include "lbxsrvopts.h" #define DrawableCache(client) (LbxClient(client)->drawableCache) diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c index 443bb0414..ac2de78f2 100644 --- a/lbx/lbxmain.c +++ b/lbx/lbxmain.c @@ -50,9 +50,9 @@ in this Software without prior written authorization from The Open Group. #include <sys/types.h> #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xos.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -64,13 +64,13 @@ in this Software without prior written authorization from The Open Group. #include "extnsionst.h" #include "servermd.h" #define _XLBX_SERVER_ -#include "lbxstr.h" -#include "lbxdeltastr.h" +#include <X11/extensions/lbxstr.h> +#include <X11/extensions/lbxdeltastr.h> #include "lbxserve.h" -#include "lbximage.h" +#include <X11/extensions/lbximage.h> #include "lbxsrvopts.h" #include "lbxtags.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include <errno.h> #ifndef Lynx #include <sys/uio.h> diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c index fdef2db7c..abaf2f395 100644 --- a/lbx/lbxopts.c +++ b/lbx/lbxopts.c @@ -26,18 +26,18 @@ #ifdef OPTDEBUG #include <stdio.h> #endif -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "colormapst.h" #include "propertyst.h" #include "lbxserve.h" -#include "lbxstr.h" -#include "lbximage.h" -#include "lbxopts.h" +#include <X11/extensions/lbxstr.h> +#include <X11/extensions/lbximage.h> +#include <X11/extensions/lbxopts.h> #include "lbxsrvopts.h" #ifndef NO_ZLIB -#include "lbxzlib.h" +#include <X11/extensions/lbxzlib.h> #endif /* NO_ZLIB */ static int LbxProxyDeltaOpt ( LbxNegOptsPtr pno, unsigned char *popt, diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c index 9082250d6..cdf48f586 100644 --- a/lbx/lbxprop.c +++ b/lbx/lbxprop.c @@ -54,8 +54,8 @@ in this Software without prior written authorization from The Open Group. #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -65,13 +65,13 @@ in this Software without prior written authorization from The Open Group. #include "colormapst.h" #include "windowstr.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "lbxserve.h" #include "lbxtags.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include <X11/extensions/security.h> #endif #include "swaprep.h" diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h index eeff64804..ed82f5aee 100644 --- a/lbx/lbxserve.h +++ b/lbx/lbxserve.h @@ -54,9 +54,9 @@ in this Software without prior written authorization from The Open Group. #define _LBXSERVE_H_ #define _XLBX_SERVER_ -#include "lbxstr.h" -#include "lbxdeltastr.h" -#include "lbxopts.h" +#include <X11/extensions/lbxstr.h> +#include <X11/extensions/lbxdeltastr.h> +#include <X11/extensions/lbxopts.h> #define MAX_LBX_CLIENTS MAXCLIENTS #define MAX_NUM_PROXIES (MAXCLIENTS >> 1) diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c index f3dc13163..b27b4a5fb 100644 --- a/lbx/lbxsquish.c +++ b/lbx/lbxsquish.c @@ -49,15 +49,15 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xos.h> #include "misc.h" #include "colormapst.h" #include "propertyst.h" #include "lbxserve.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> /* handles server-side protocol squishing */ diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h index ea7f2420e..8b0420452 100644 --- a/lbx/lbxsrvopts.h +++ b/lbx/lbxsrvopts.h @@ -26,7 +26,7 @@ #ifndef _LBX_SRVOPTS_H_ #define _LBX_SRVOPTS_H_ -#include "lbxopts.h" +#include <X11/extensions/lbxopts.h> typedef struct _LbxNegOpts { int nopts; diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c index 23fdd30f7..474d12f71 100644 --- a/lbx/lbxswap.c +++ b/lbx/lbxswap.c @@ -50,9 +50,9 @@ in this Software without prior written authorization from The Open Group. #include <sys/types.h> #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xos.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -62,9 +62,9 @@ in this Software without prior written authorization from The Open Group. #include "swaprep.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "lbxserve.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include <stdio.h> diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c index 6fdc4d5a2..0c98731fe 100644 --- a/lbx/lbxtags.c +++ b/lbx/lbxtags.c @@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "lbxdata.h" #include "resource.h" @@ -56,7 +56,7 @@ in this Software without prior written authorization from The Open Group. #include "propertyst.h" #include "lbxtags.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #include "propertyst.h" static RESTYPE TagResType; diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h index 376a4cc27..aef093448 100644 --- a/lbx/lbxtags.h +++ b/lbx/lbxtags.h @@ -55,8 +55,8 @@ in this Software without prior written authorization from The Open Group. #include "os.h" #include "opaque.h" #include "resource.h" -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> typedef struct _tagdata { XID tid; diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c index 20d58b37b..7ca126c25 100644 --- a/lbx/lbxzerorep.c +++ b/lbx/lbxzerorep.c @@ -36,7 +36,7 @@ from The Open Group. */ #define NEED_REPLIES -#include "X.h" +#include <X11/X.h> #include <X11/Xproto.h> void diff --git a/mfb/maskbits.h b/mfb/maskbits.h index 654ab3d0e..fa5ffca4d 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -24,8 +24,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: maskbits.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" diff --git a/mfb/mergerop.h b/mfb/mergerop.h index 6b5548b12..ba699466c 100644 --- a/mfb/mergerop.h +++ b/mfb/mergerop.h @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. #define _MERGEROP_H_ #ifndef GXcopy -#include "X.h" +#include <X11/X.h> #endif typedef struct _mergeRopBits { diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 6e950e837..0a5b377b7 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbitblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index ca240ba99..6aff98cac 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -32,9 +32,9 @@ Author: Keith Packard */ /* $Xorg: mfbblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mfb.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index b1fad2192..3723914b6 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "mfb.h" #include "maskbits.h" diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index a7ffdc36c..7a924b713 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "mfb.h" #include "maskbits.h" diff --git a/mfb/mfbbstore.c b/mfb/mfbbstore.c index 661ed0827..d30c67ae7 100644 --- a/mfb/mfbbstore.c +++ b/mfb/mfbbstore.c @@ -29,7 +29,7 @@ from The Open Group. */ #include "mfb.h" -#include "X.h" +#include <X11/X.h> #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 7c9be7f97..32e1da934 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index 253399df4..15c73245f 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbcmap.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 9e65d8340..4e1e0623d 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -27,8 +27,8 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mfbfillarc.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index aa90f411b..13f57e000 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillrct.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index 8fd4c0f29..6c3a2b506 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillsp.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" diff --git a/mfb/mfbfont.c b/mfb/mfbfont.c index f77e70a26..e4ec62cbc 100644 --- a/mfb/mfbfont.c +++ b/mfb/mfbfont.c @@ -45,9 +45,9 @@ SOFTWARE. */ /* $Xorg: mfbfont.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index c7dccf93d..3b0ebedb0 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -46,9 +46,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mfb.h" #include "dixfontstr.h" #include "fontstruct.h" diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index b63a184f8..1d67bc55e 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "region.h" diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index 626ef67fb..a8f25f127 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbhrzvert.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gc.h" #include "window.h" diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index 1fb40db5a..b305a2cd4 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" @@ -56,7 +56,7 @@ SOFTWARE. #include "mfb.h" #include "mi.h" -#include "Xmd.h" +#include <X11/Xmd.h> #include "maskbits.h" diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index aa948a34e..0a4bb6df1 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimggblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbline.c b/mfb/mfbline.c index b8e1d3648..c30deedc7 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbline.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbmisc.c b/mfb/mfbmisc.c index c3e0d3d71..0a4e7f773 100644 --- a/mfb/mfbmisc.c +++ b/mfb/mfbmisc.c @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "cursor.h" #include "scrnintstr.h" diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index b6ff40292..ebf086ad8 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -52,7 +52,7 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "maskbits.h" diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index f3f8decc7..6c2af609a 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index 5e4a619be..e8bb8cbce 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbplygblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbpntarea.c b/mfb/mfbpntarea.c index 6b45d3f48..c9aac2c36 100644 --- a/mfb/mfbpntarea.c +++ b/mfb/mfbpntarea.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpntarea.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/mfb/mfbpntwin.c b/mfb/mfbpntwin.c index 97db3bf79..e6dcdfdca 100644 --- a/mfb/mfbpntwin.c +++ b/mfb/mfbpntwin.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index 5c99d03de..e9cbbe36f 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -48,8 +48,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpolypnt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index b268c559f..511d6c22c 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpushpxl.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index 7e840303c..923db41e1 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -47,9 +47,9 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbscrinit.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xproto.h" /* for xColorItem */ -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xproto.h> /* for xColorItem */ +#include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index 66da37d1d..0a97507e0 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -48,8 +48,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbsetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" #include "regionstr.h" diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index b0e02850c..455e44c1b 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -49,9 +49,9 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xmd.h> +#include <X11/Xproto.h> #include "mfb.h" #include "fontstruct.h" #include "dixfontstr.h" diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index 50b261114..25a820b9a 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbtile.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "regionstr.h" diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index 294083f78..1f277e4b4 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -48,7 +48,7 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "mfb.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index ad46732ab..54d61bad1 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -49,7 +49,7 @@ SOFTWARE. #ifndef MI_H #define MI_H -#include "X11/X.h" +#include <X11/X.h> #include "region.h" #include "validate.h" #include "window.h" diff --git a/mi/miarc.c b/mi/miarc.c index 1c37551e3..ee2a03840 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.1.4.3 2003/12/20 00:28:31 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.2 2004/04/23 19:54:26 eich Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ /*********************************************************** @@ -58,8 +58,8 @@ SOFTWARE. #include <math.h> #undef _XOPEN_SOURCE #endif -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "misc.h" #include "gcstruct.h" #include "scrnintstr.h" @@ -68,7 +68,7 @@ SOFTWARE. #include "mifpoly.h" #include "mi.h" #include "mifillarc.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> static double miDsin(double a); static double miDcos(double a); diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 452727455..5d3a9da70 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -48,8 +48,8 @@ SOFTWARE. /* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Author: Todd Newman (aided and abetted by Mr. Drewry) */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "misc.h" #include "gcstruct.h" @@ -58,7 +58,7 @@ SOFTWARE. #include "scrnintstr.h" #include "mi.h" #include "regionstr.h" -#include "Xmd.h" +#include <X11/Xmd.h> #include "servermd.h" #ifndef HAS_FFS diff --git a/mi/mibstore.c b/mi/mibstore.c index 1cd35c4dd..aae3bcfa9 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -45,9 +45,9 @@ implied warranty. /* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi 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 "regionstr.h" #include "scrnintstr.h" diff --git a/mi/miclipn.c b/mi/miclipn.c index 456ad08c4..e9f43ab2a 100644 --- a/mi/miclipn.c +++ b/mi/miclipn.c @@ -28,7 +28,7 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "scrnintstr.h" #include "mi.h" diff --git a/mi/micmap.c b/mi/micmap.c index 2018a093a..1f3c67dae 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -36,8 +36,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" diff --git a/mi/midispcur.c b/mi/midispcur.c index 08c9f9216..2c3cfced4 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */ #define NEED_EVENTS -# include "X.h" +# include <X11/X.h> # include "misc.h" # include "input.h" # include "cursorstr.h" @@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open Group. */ # 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/mi/miexpose.c b/mi/miexpose.c index 897c680b3..6ff2afd36 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.2 2004/04/23 19:54:26 eich Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ /*********************************************************** @@ -76,10 +76,10 @@ Equipment Corporation. /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS -#include "Xproto.h" -#include "Xprotostr.h" +#include <X11/Xproto.h> +#include <X11/Xprotostr.h> #include "misc.h" #include "regionstr.h" @@ -91,7 +91,7 @@ Equipment Corporation. #include "dixstruct.h" #include "mi.h" -#include "Xmd.h" +#include <X11/Xmd.h> #include "globals.h" diff --git a/mi/mifillarc.c b/mi/mifillarc.c index c8b901c85..d49ae1d92 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -30,8 +30,8 @@ Author: Bob Scheifler, MIT X Consortium /* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ #include <math.h> -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mi/mifillrct.c b/mi/mifillrct.c index 31219869e..d74aa2466 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -47,8 +47,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmap.h" diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index ae41cf6f6..d659c7967 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include <math.h> -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/mi/miglblt.c b/mi/miglblt.c index f2a748db6..b1ae60250 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -48,9 +48,9 @@ SOFTWARE. /* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#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 "fontstruct.h" #include "dixfontstr.h" diff --git a/mi/miinitext.c b/mi/miinitext.c index 06ed7ad29..4cfc818b1 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.15 2004/12/08 05:48:16 gisburn Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.16 2005/03/19 20:51:34 gisburn Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** @@ -214,38 +214,38 @@ typedef void (*InitExtension)(INITARGS); #ifdef MITSHM #define _XSHM_SERVER_ -#include "shmstr.h" +#include <X11/extensions/shmstr.h> #endif #ifdef XTEST #define _XTEST_SERVER_ -#include "XTest.h" +#include <X11/extensions/XTest.h> #endif #ifdef XKB -#include "XKB.h" +#include <X11/extensions/XKB.h> #endif #ifdef LBX #define _XLBX_SERVER_ -#include "lbxstr.h" +#include <X11/extensions/lbxstr.h> #endif #ifdef XPRINT #include "Print.h" #endif #ifdef XAPPGROUP #define _XAG_SERVER_ -#include "Xagstr.h" +#include <X11/extensions/Xagstr.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "securstr.h" +#include <X11/extensions/securstr.h> #endif #ifdef PANORAMIX -#include "panoramiXproto.h" +#include <X11/extensions/panoramiXproto.h> #endif #ifdef XF86BIGFONT #include "xf86bigfstr.h" #endif #ifdef RES -#include "XResproto.h" +#include <X11/extensions/XResproto.h> #endif /* FIXME: this whole block of externs should be from the appropriate headers */ diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 74cd18022..dfdfdecd7 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" diff --git a/mi/mipointer.c b/mi/mipointer.c index 2e4ee607b..85474f692 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -31,9 +31,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes 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/mi/mipoly.c b/mi/mipoly.c index 2c420b250..138552d14 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -56,7 +56,7 @@ SOFTWARE. * to the appropriate routine to actually scan convert the * polygon. */ -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mi/mipolygen.c b/mi/mipolygen.c index 484a29798..d63dfaec2 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "miscanfill.h" #include "mipoly.h" diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index f88545cfd..eec246df5 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -46,8 +46,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 07964cf82..6976f7d3c 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -46,8 +46,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index fe4993914..bb9259450 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -46,8 +46,8 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" diff --git a/mi/mipolytext.c b/mi/mipolytext.c index a3f64a086..d36fbd22a 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -55,9 +55,9 @@ SOFTWARE. * Date: Thu Feb 5 1987 */ -#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 "gcstruct.h" #include "fontstruct.h" diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 019ba437e..49409a247 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mi/miregion.c b/mi/miregion.c index 2057deb62..ddb59fc2d 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -78,7 +78,7 @@ Equipment Corporation. ******************************************************************/ #include "regionstr.h" -#include "Xprotostr.h" +#include <X11/Xprotostr.h> #include "gc.h" #include "mi.h" #include "mispans.h" diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 7f8ee48ad..ecf934d54 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -28,7 +28,7 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "servermd.h" #include "misc.h" #include "mi.h" @@ -38,7 +38,7 @@ from The Open Group. #include "miline.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include "XShm.h" +#include <X11/extensions/XShm.h> #endif /* We use this structure to propogate some information from miScreenInit to diff --git a/mi/misprite.c b/mi/misprite.c index df19784e0..64fd04eb5 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.10tsi 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/mi/mivaltree.c b/mi/mivaltree.c index 6036f6057..415d5a63a 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -1,5 +1,5 @@ /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.2.2.1 2004/07/30 06:54:42 anholt Exp $ */ +/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.3 2004/07/31 08:24:14 anholt Exp $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function @@ -92,7 +92,7 @@ Equipment Corporation. * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" diff --git a/mi/miwideline.c b/mi/miwideline.c index 20bef031b..606ccd43a 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -43,7 +43,7 @@ from The Open Group. #include <math.h> #undef _XOPEN_SOURCE #endif -#include "X.h" +#include <X11/X.h> #include "windowstr.h" #include "gcstruct.h" #include "regionstr.h" diff --git a/mi/miwindow.c b/mi/miwindow.c index 545fb3307..1ebb0cee2 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "regionstr.h" #include "region.h" #include "mi.h" diff --git a/mi/mizerarc.c b/mi/mizerarc.c index e36b2f3f0..282bf6df8 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -36,8 +36,8 @@ Author: Bob Scheifler, MIT X Consortium */ #include <math.h> -#include "X.h" -#include "Xprotostr.h" +#include <X11/X.h> +#include <X11/Xprotostr.h> #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mi/mizerclip.c b/mi/mizerclip.c index 304f525ae..26335dfb5 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.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 "misc.h" #include "scrnintstr.h" diff --git a/mi/mizerline.c b/mi/mizerline.c index 4672f6bd3..d04780aa2 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ -#include "X.h" +#include <X11/X.h> #include "misc.h" #include "scrnintstr.h" diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h index dcfaf5e56..91393adc4 100644 --- a/miext/layer/layerstr.h +++ b/miext/layer/layerstr.h @@ -25,7 +25,7 @@ #ifndef _LAYERSTR_H_ #define _LAYERSTR_H_ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index 9e61603b5..51a2e99ad 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -90,7 +90,7 @@ Equipment Corporation. * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index ec9dbf335..2c2a26201 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -23,7 +23,7 @@ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 5440324e6..0514b9a2e 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -23,7 +23,7 @@ */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index fc23ce823..5a19bcc4b 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index c43313a1c..e9fc784b4 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index 46d45ab39..f2a2215ed 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index f9aebc446..f870ef05c 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index 475fdda3d..a3ef338ee 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -27,7 +27,7 @@ * orientations work. */ -#include "X.h" +#include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/os/WaitFor.c b/os/WaitFor.c index fe4b81ce7..a4b95cba2 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -59,10 +59,10 @@ SOFTWARE. #ifdef WIN32 #include <X11/Xwinsock.h> #endif -#include "Xos.h" /* for strings, fcntl, time */ +#include <X11/Xos.h> /* for strings, fcntl, time */ #include <errno.h> #include <stdio.h> -#include "X.h" +#include <X11/X.h> #include "misc.h" #ifdef __UNIXOS2__ @@ -111,7 +111,7 @@ mffs(fd_mask mask) #ifdef DPMSExtension #define DPMS_SERVER -#include "dpms.h" +#include <X11/extensions/dpms.h> #endif #ifdef XTESTEXT1 diff --git a/os/access.c b/os/access.c index d687e3515..727fa26f0 100644 --- a/os/access.c +++ b/os/access.c @@ -1,5 +1,5 @@ /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ -/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.6 2004/10/17 10:46:14 herrb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.7 2004/11/15 15:06:50 ago Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -63,10 +63,10 @@ SOFTWARE. #include <stdio.h> #include <stdlib.h> -#include <X11/Xtrans.h> +#include <X11/Xtrans/Xtrans.h> #include <X11/Xauth.h> -#include <X.h> -#include <Xproto.h> +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "site.h" #include <errno.h> @@ -197,7 +197,7 @@ SOFTWARE. #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include <X11/extensions/security.h> #endif #ifndef PATH_MAX @@ -45,7 +45,7 @@ from The Open Group. # include <sys/stat.h> #ifdef XCSECURITY #define _SECURITY_SERVER -# include "extensions/security.h" +# include <X11/extensions/security.h> #endif #ifdef WIN32 #include "Xw32defs.h" diff --git a/os/connection.c b/os/connection.c index 3ec64c099..81134a840 100644 --- a/os/connection.c +++ b/os/connection.c @@ -66,9 +66,9 @@ SOFTWARE. #ifdef WIN32 #include <X11/Xwinsock.h> #endif -#include "X.h" -#include "Xproto.h" -#include <X11/Xtrans.h> +#include <X11/X.h> +#include <X11/Xproto.h> +#include <X11/Xtrans/Xtrans.h> #include <errno.h> #include <signal.h> #include <stdio.h> @@ -141,11 +141,11 @@ extern __const__ int _nfiles; #include "opaque.h" #include "dixstruct.h" #ifdef XAPPGROUP -#include "extensions/Xagsrv.h" +#include <X11/extensions/Xagsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include <X11/extensions/security.h> #endif #ifdef LBX #include "colormapst.h" @@ -62,8 +62,8 @@ SOFTWARE. #include <X11/Xwinsock.h> #endif #include <stdio.h> -#include <X11/Xtrans.h> -#include "Xmd.h" +#include <X11/Xtrans/Xtrans.h> +#include <X11/Xmd.h> #include <errno.h> #if !defined(__UNIXOS2__) && !defined(WIN32) #ifndef Lynx @@ -72,12 +72,12 @@ SOFTWARE. #include <uio.h> #endif #endif -#include "X.h" +#include <X11/X.h> #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "os.h" #include "osdep.h" -#include "Xpoll.h" +#include <X11/Xpoll.h> #include "opaque.h" #include "dixstruct.h" #include "misc.h" @@ -121,7 +121,7 @@ OsCommPtr AvailableInput = (OsCommPtr)NULL; lswaps((req)->length) : (req)->length) #ifdef BIGREQS -#include "bigreqstr.h" +#include <X11/extensions/bigreqstr.h> #define get_big_req_len(req,cli) ((cli)->swapped ? \ lswapl(((xBigReq *)(req))->length) : \ diff --git a/os/k5auth.c b/os/k5auth.c index 3726df6ba..876e04222 100644 --- a/os/k5auth.c +++ b/os/k5auth.c @@ -50,11 +50,11 @@ from The Open Group. #undef BITS32 #undef xfree #include <krb5/los-proto.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "osdep.h" -#include "Xproto.h" -#include "Xfuncs.h" +#include <X11/Xproto.h> +#include <X11/Xfuncs.h> #include "dixstruct.h" #include <com_err.h> #include "Xauth.h" diff --git a/os/lbxio.c b/os/lbxio.c index 86ed58800..c44389010 100644 --- a/os/lbxio.c +++ b/os/lbxio.c @@ -50,8 +50,8 @@ SOFTWARE. /* $Xorg: lbxio.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ #include <stdio.h> -#include <X11/Xtrans.h> -#include "Xmd.h" +#include <X11/Xtrans/Xtrans.h> +#include <X11/Xmd.h> #include <errno.h> #ifndef Lynx #include <sys/param.h> @@ -61,10 +61,10 @@ SOFTWARE. #else #include <uio.h> #endif -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "os.h" -#include "Xpoll.h" +#include <X11/Xpoll.h> #include "osdep.h" #include "opaque.h" #include "dixstruct.h" @@ -78,7 +78,7 @@ OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */ -#include "Xos.h" +#include <X11/Xos.h> #include <stdio.h> #include <time.h> #include <sys/stat.h> diff --git a/os/mitauth.c b/os/mitauth.c index 97f88b232..6ad0c3467 100644 --- a/os/mitauth.c +++ b/os/mitauth.c @@ -33,7 +33,7 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "osdep.h" #include "dixstruct.h" diff --git a/os/osinit.c b/os/osinit.c index 1a5ff0501..76938ce43 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -48,10 +48,10 @@ SOFTWARE. /* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ #include <stdio.h> -#include "X.h" +#include <X11/X.h> #include "os.h" #include "osdep.h" -#include "Xos.h" +#include <X11/Xos.h> #ifdef SMART_SCHEDULE #include "dixstruct.h" diff --git a/os/rpcauth.c b/os/rpcauth.c index f0693f599..6b0cf816c 100644 --- a/os/rpcauth.c +++ b/os/rpcauth.c @@ -36,7 +36,7 @@ from The Open Group. #ifdef SECURE_RPC -#include "X.h" +#include <X11/X.h> #include "Xauth.h" #include "misc.h" #include "os.h" diff --git a/os/secauth.c b/os/secauth.c index 8c30eaafb..4daeba1a5 100644 --- a/os/secauth.c +++ b/os/secauth.c @@ -26,7 +26,7 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */ -#include "X.h" +#include <X11/X.h> #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -34,7 +34,7 @@ from The Open Group. #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include <X11/extensions/security.h> #endif static char InvalidPolicyReason[] = "invalid policy specification"; diff --git a/os/utils.c b/os/utils.c index b7ef37ee5..a8e1b49c6 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.11 2004/11/25 12:48:21 ago Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.12 2005/03/23 19:58:45 gisburn Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* @@ -60,11 +60,11 @@ OR PERFORMANCE OF THIS SOFTWARE. #if defined(WIN32) && !defined(__CYGWIN__) #include <X11/Xwinsock.h> #endif -#include "Xos.h" +#include <X11/Xos.h> #include <stdio.h> #include "misc.h" -#include "X.h" -#include <X11/Xtrans.h> +#include <X11/X.h> +#include <X11/Xtrans/Xtrans.h> #include "input.h" #include "dixfont.h" #include "osdep.h" @@ -112,11 +112,11 @@ OR PERFORMANCE OF THIS SOFTWARE. #endif #ifdef XKB -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include <X11/extensions/security.h> #endif #ifdef RENDER diff --git a/os/xalloc.c b/os/xalloc.c index 6740e89cb..ad606b2a2 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -35,9 +35,9 @@ Pascal Haible. #include <stdlib.h> /* for malloc() etc. */ -#include "Xos.h" +#include <X11/Xos.h> #include "misc.h" -#include "X.h" +#include <X11/X.h> #ifdef XALLOC_LOG #include <stdio.h> diff --git a/os/xdmauth.c b/os/xdmauth.c index 4ec7265dd..1d4a7d2c3 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -36,8 +36,8 @@ from The Open Group. */ #include <stdio.h> -#include "X.h" -#include "Xtrans.h" +#include <X11/X.h> +#include <X11/Xtrans/Xtrans.h> #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -47,7 +47,7 @@ from The Open Group. static Bool authFromXDMCP; #ifdef XDMCP -#include "Xmd.h" +#include <X11/Xmd.h> #undef REQUEST #include "Xdmcp.h" diff --git a/os/xdmcp.c b/os/xdmcp.c index 6cf792937..82e2f297c 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.3 2004/07/20 15:15:13 ago Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.4 2004/11/15 15:06:50 ago Exp $ */ /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. @@ -20,7 +20,7 @@ #include <Xwinsock.h> #endif -#include "Xos.h" +#include <X11/Xos.h> #if !defined(WIN32) #ifndef Lynx @@ -35,10 +35,10 @@ #include <stdio.h> #include <stdlib.h> -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "misc.h" -#include "Xpoll.h" +#include <X11/Xpoll.h> #include "osdep.h" #include "input.h" #include "dixstruct.h" diff --git a/os/xprintf.c b/os/xprintf.c index ee5d7daf6..cb9f1460a 100644 --- a/os/xprintf.c +++ b/os/xprintf.c @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -#include "Xos.h" +#include <X11/Xos.h> #include "os.h" #include <stdarg.h> #include <stdio.h> diff --git a/randr/mirandr.c b/randr/mirandr.c index 2f4653e5d..ac29485bb 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -27,7 +27,7 @@ #include "scrnintstr.h" #include "mi.h" -#include "randr.h" +#include <X11/extensions/randr.h> #include "randrstr.h" #include <stdio.h> diff --git a/randr/randr.c b/randr/randr.c index 44d5aafe9..cdb81a6d5 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -27,8 +27,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 "os.h" #include "dixstruct.h" @@ -38,14 +38,14 @@ #include "pixmapstr.h" #include "extnsionst.h" #include "servermd.h" -#include "randr.h" -#include "randrproto.h" +#include <X11/extensions/randr.h> +#include <X11/extensions/randrproto.h> #include "randrstr.h" #ifdef RENDER -#include "render.h" /* we share subpixel order information */ +#include <X11/extensions/render.h> /* we share subpixel order information */ #include "picturestr.h" #endif -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #ifdef EXTMODULE #include "xf86_ansic.h" #endif diff --git a/randr/randrstr.h b/randr/randrstr.h index 758bb95dd..eecadd7b5 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -25,7 +25,7 @@ #ifndef _RANDRSTR_H_ #define _RANDRSTR_H_ -#include "randr.h" +#include <X11/extensions/randr.h> typedef struct _rrScreenRate { int rate; diff --git a/record/record.c b/record/record.c index e4d4dc5d8..d20617200 100644 --- a/record/record.c +++ b/record/record.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.2 2004/04/23 19:54:28 eich Exp $ */ /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* @@ -39,7 +39,7 @@ and Jim Haggerty of Metheus. #include "dixstruct.h" #include "extnsionst.h" #define _XRECORD_SERVER_ -#include "recordstr.h" +#include <X11/extensions/recordstr.h> #include "set.h" #ifndef XFree86LOADER diff --git a/render/animcur.c b/render/animcur.c index 81b1b8f90..1e857574e 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -32,8 +32,8 @@ * delta times between each image. */ -#include "X.h" -#include "Xmd.h" +#include <X11/X.h> +#include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/render/glyphstr.h b/render/glyphstr.h index 821d88eea..f4777a248 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -26,7 +26,7 @@ #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ -#include "renderproto.h" +#include <X11/extensions/renderproto.h> #include "picture.h" #include "screenint.h" diff --git a/render/render.c b/render/render.c index f71eaeabd..aeaeaa2a5 100644 --- a/render/render.c +++ b/render/render.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.5 2004/08/06 23:42:10 keithp Exp $ */ +/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.6 2004/12/04 00:43:13 kuhn Exp $ */ /* * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ * @@ -26,8 +26,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 "os.h" #include "dixstruct.h" @@ -38,11 +38,11 @@ #include "colormapst.h" #include "extnsionst.h" #include "servermd.h" -#include "render.h" -#include "renderproto.h" +#include <X11/extensions/render.h> +#include <X11/extensions/renderproto.h> #include "picturestr.h" #include "glyphstr.h" -#include "Xfuncproto.h" +#include <X11/Xfuncproto.h> #include "cursorstr.h" #ifdef EXTMODULE #include "xf86_ansic.h" diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c index 6eee7e097..665f0e5a2 100644 --- a/xkb/ddxBeep.c +++ b/xkb/ddxBeep.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> #if (defined(__osf__) && defined(__alpha)) #include <sys/sysinfo.h> diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c index c4a6ec7a0..70c10e202 100644 --- a/xkb/ddxConfig.c +++ b/xkb/ddxConfig.c @@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "windowstr.h" #include "os.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #include <X11/extensions/XKBconfig.h> Bool diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index 16c9f15b9..278cd1dc0 100644 --- a/xkb/ddxCtrls.c +++ b/xkb/ddxCtrls.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> void XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl) diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c index 0ce401adb..f93934a77 100644 --- a/xkb/ddxDevBtn.c +++ b/xkb/ddxDevBtn.c @@ -34,9 +34,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> extern int DeviceValuator; diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c index 033aa18ea..540b72292 100644 --- a/xkb/ddxFakeBtn.c +++ b/xkb/ddxFakeBtn.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> void XkbDDXFakePointerButton(int event,int button) diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index 70f37d130..cfadb2d62 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */ /* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -35,8 +35,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> #ifdef PANORAMIX #include "panoramiX.h" diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c index dea4ce607..75567486d 100644 --- a/xkb/ddxInit.c +++ b/xkb/ddxInit.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> int XkbDDXInitDevice(DeviceIntPtr dev) diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c index c0b2b8018..19a2ec9e1 100644 --- a/xkb/ddxKeyClick.c +++ b/xkb/ddxKeyClick.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> void XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic) diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c index 98744ed97..7a822fa20 100644 --- a/xkb/ddxKillSrv.c +++ b/xkb/ddxKillSrv.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index e7c484cab..5998f7614 100644 --- a/xkb/ddxLEDs.c +++ b/xkb/ddxLEDs.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> void XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new) diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 6a070f8a9..7e7c375ad 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> #ifndef PATH_MAX #ifdef MAXPATHLEN diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 906715a2b..c2b1f18ee 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> #include "xkb.h" #if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c index 852e2386f..3a9f8ea0b 100644 --- a/xkb/ddxPrivate.c +++ b/xkb/ddxPrivate.c @@ -5,7 +5,7 @@ #include <X11/X.h> #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #ifdef XF86DDXACTIONS #include "xf86.h" diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c index bbd0d1ac1..aa8cba00b 100644 --- a/xkb/ddxVT.c +++ b/xkb/ddxVT.c @@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XI.h> #ifdef XF86DDXACTIONS #include "xf86.h" @@ -27,19 +27,19 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */ #include <stdio.h> -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "misc.h" #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #include "extnsionst.h" #include "modinit.h" #include "xkb.h" -#include "XI.h" +#include <X11/extensions/XI.h> int XkbEventBase; int XkbErrorBase; @@ -3907,7 +3907,7 @@ ProcXkbSetNames(ClientPtr client) /***====================================================================***/ -#include "XKBgeom.h" +#include <X11/extensions/XKBgeom.h> #define XkbSizeCountedString(s) ((s)?((((2+strlen(s))+3)/4)*4):4) diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 5794e34ba..6e519dc5a 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/Xproto.h> #include <X11/keysym.h> #include "inputstr.h" -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #if !defined(WIN32) && !defined(Lynx) #include <sys/time.h> #endif diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 0239c678a..f7fa0af28 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/keysym.h> #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #include "xkb.h" #include <ctype.h> diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 7d2421a87..29ce818c1 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -31,10 +31,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/X.h> #include <X11/Xproto.h> #include <X11/keysym.h> -#include "XI.h" +#include <X11/extensions/XI.h> #include "inputstr.h" #include "windowstr.h" -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #include "xkb.h" /***====================================================================***/ diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 260446eb8..506b5458e 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -1,5 +1,5 @@ /* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/xkb/xkbInit.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -42,8 +42,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "opaque.h" #include "property.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XKBgeom.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XKBgeom.h> #include <X11/extensions/XKMformat.h> #include <X11/extensions/XKBfile.h> #include "xkb.h" diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 26e6d87d3..7cdd21ae3 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -35,8 +35,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "misc.h" #include "inputstr.h" -#include "XI.h" -#include "XKBsrv.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XKBsrv.h> #include "xkb.h" /***====================================================================***/ diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 43288d3e9..175f7ff22 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/keysym.h> #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #include <ctype.h> diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index ec155645f..08af172b7 100644 --- a/xkb/xkbPrOtherEv.c +++ b/xkb/xkbPrOtherEv.c @@ -34,10 +34,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <X11/keysym.h> #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> -#include "XI.h" -#include "XIproto.h" +#include <X11/extensions/XI.h> +#include <X11/extensions/XIproto.h> extern void ProcessOtherEvent( xEvent * /* xE */, diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index 4b6ba4ccc..520885515 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.c @@ -27,14 +27,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */ #include "stdio.h" -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" -#include "XKBstr.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XKBstr.h> #include "extnsionst.h" #include "xkb.h" diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 8b439c2a5..61585ebdb 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "extensions/XKBgeom.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XKBgeom.h> #include "xkb.h" #ifdef MODE_SWITCH |