summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
Diffstat (limited to 'Xext')
-rw-r--r--Xext/EVI.c6
-rw-r--r--Xext/appgroup.c14
-rw-r--r--Xext/bigreq.c6
-rw-r--r--Xext/cup.c8
-rw-r--r--Xext/dpms.c8
-rw-r--r--Xext/fontcache.c6
-rw-r--r--Xext/mbuf.c6
-rw-r--r--Xext/mbufbf.c6
-rw-r--r--Xext/mbufpx.c6
-rw-r--r--Xext/mitmisc.c6
-rw-r--r--Xext/panoramiX.c8
-rw-r--r--Xext/panoramiX.h4
-rw-r--r--Xext/panoramiXSwap.c6
-rw-r--r--Xext/panoramiXprocs.c4
-rw-r--r--Xext/sampleEVI.c6
-rw-r--r--Xext/saver.c8
-rw-r--r--Xext/security.c10
-rw-r--r--Xext/shape.c8
-rw-r--r--Xext/shm.c8
-rw-r--r--Xext/sleepuntil.c4
-rw-r--r--Xext/sync.c10
-rw-r--r--Xext/xcmisc.c6
-rw-r--r--Xext/xevie.c6
-rw-r--r--Xext/xf86bigfont.c4
-rw-r--r--Xext/xprint.c8
-rw-r--r--Xext/xres.c8
-rw-r--r--Xext/xtest.c14
-rw-r--r--Xext/xtest1dd.c10
-rw-r--r--Xext/xtest1di.c8
-rw-r--r--Xext/xvdisp.c12
-rw-r--r--Xext/xvdix.h2
-rw-r--r--Xext/xvmain.c10
-rw-r--r--Xext/xvmc.c12
-rw-r--r--Xext/xvmcext.h2
34 files changed, 125 insertions, 125 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 {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 08:28:07 +0000