Commit 292c4cff authored by Daniel Stone's avatar Daniel Stone

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.
parent c062d7f9
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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; }
......
......@@ -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;
......
......@@ -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"
......
/* $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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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(
......
/* $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"
......
/* $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
......
/* $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
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -33,8 +33,8 @@ of the copyright holder.
#define NEED_REPLIES
#define NEED_EVENTS