debrix/Xext EVI.c, 1.2, 1.3 EVIstruct.h, 1.2, 1.3 appgroup.c, 1.2, 1.3 bigreq.c, 1.2, 1.3 cup.c, 1.2, 1.3 dgaproc.h, 1.2, 1.3 dpms.c, 1.2, 1.3 dpmsproc.h, 1.2, 1.3 dpmsstubs.c, 1.2, 1.3 fontcache.c, 1.2, 1.3 mbuf.c, 1.2, 1.3 mbufbf.c, 1.2, 1.3 mbufpx.c, 1.2, 1.3 mitmisc.c, 1.2, 1.3 panoramiX.c, 1.2, 1.3 panoramiX.h, 1.2, 1.3 panoramiXSwap.c, 1.2, 1.3 panoramiXh.h, 1.2, 1.3 panoramiXprocs.c, 1.2, 1.3 panoramiXsrv.h, 1.2, 1.3 sampleEVI.c, 1.2, 1.3 saver.c, 1.2, 1.3 security.c, 1.2, 1.3 shape.c, 1.2, 1.3 shm.c, 1.2, 1.3 sleepuntil.c, 1.2, 1.3 sleepuntil.h, 1.1.1.2, 1.2 sync.c, 1.2, 1.3 vidmodeproc.h, 1.2, 1.3 xcmisc.c, 1.2, 1.3 xf86bigfont.c, 1.2, 1.3 xf86dga.c, 1.2, 1.3 xf86dga2.c, 1.2, 1.3 xf86dgaext.h, 1.2, 1.3 xf86misc.c, 1.1.1.2, 1.2 xf86miscproc.h, 1.2, 1.3 xf86vmode.c, 1.2, 1.3 xprint.c, 1.2, 1.3 xres.c, 1.2, 1.3 xtest.c, 1.2, 1.3 xtest1dd.c, 1.2, 1.3 xtest1dd.h, 1.2, 1.3 xtest1di.c, 1.2, 1.3 xvdisp.c, 1.2, 1.3 xvdix.h, 1.2, 1.3 xvmain.c, 1.2, 1.3 xvmc.c, 1.2, 1.3 xvmcext.h, 1.2, 1.3 xvmod.c, 1.2, 1.3 xvmodproc.h, 1.2, 1.3

Daniel Stone xserver-commit at pdx.freedesktop.org
Fri Jun 11 05:39:33 EST 2004 

Committed by: daniel

Update of /cvs/xserver/debrix/Xext
In directory pdx:/home/daniel/x/debrix/debrix/Xext

Modified Files:
	EVI.c EVIstruct.h appgroup.c bigreq.c cup.c dgaproc.h dpms.c 
	dpmsproc.h dpmsstubs.c fontcache.c mbuf.c mbufbf.c mbufpx.c 
	mitmisc.c panoramiX.c panoramiX.h panoramiXSwap.c panoramiXh.h 
	panoramiXprocs.c panoramiXsrv.h sampleEVI.c saver.c security.c 
	shape.c shm.c sleepuntil.c sleepuntil.h sync.c vidmodeproc.h 
	xcmisc.c xf86bigfont.c xf86dga.c xf86dga2.c xf86dgaext.h 
	xf86misc.c xf86miscproc.h xf86vmode.c xprint.c xres.c xtest.c 
	xtest1dd.c xtest1dd.h xtest1di.c xvdisp.c xvdix.h xvmain.c 
	xvmc.c xvmcext.h xvmod.c xvmodproc.h 
Log Message:
Initial import from modular sources.


Index: EVI.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/EVI.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EVI.c	23 Apr 2004 18:44:41 -0000	1.2
+++ EVI.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -23,8 +23,11 @@
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "dix.h"

Index: EVIstruct.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/EVIstruct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EVIstruct.h	23 Apr 2004 18:44:41 -0000	1.2
+++ EVIstruct.h	10 Jun 2004 19:39:30 -0000	1.3
@@ -23,6 +23,9 @@
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef EVI_STRUCT_H
 #define EVI_STRUCT_H
 

Index: appgroup.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/appgroup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- appgroup.c	23 Apr 2004 18:44:41 -0000	1.2
+++ appgroup.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -26,10 +26,13 @@
 */
 /* $Xorg: appgroup.c,v 1.6 2001/02/09 02:04:32 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"
@@ -42,7 +45,7 @@
 #include "Xagsrv.h"
 #define _SECURITY_SERVER
 #include "security.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 #define XSERV_t
 #include <X11/Xtrans.h>

Index: bigreq.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/bigreq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bigreq.c	23 Apr 2004 18:44:41 -0000	1.2
+++ bigreq.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -28,14 +28,17 @@
 */
 /* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"
 

Index: cup.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/cup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cup.c	23 Apr 2004 18:44:41 -0000	1.2
+++ cup.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -26,10 +26,13 @@
 */
 /* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.11tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"
@@ -39,7 +42,7 @@
 #include "swapreq.h"
 #define _XCUP_SERVER_
 #include "Xcupstr.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 #ifndef EXTMODULE
 #include "../os/osdep.h"

Index: dgaproc.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/dgaproc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dgaproc.h	23 Apr 2004 18:44:41 -0000	1.2
+++ dgaproc.h	10 Jun 2004 19:39:30 -0000	1.3
@@ -1,9 +1,12 @@
 /* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef __DGAPROC_H
 #define __DGAPROC_H
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "pixmap.h"
 
 #define DGA_CONCURRENT_ACCESS	0x00000001

Index: dpms.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/dpms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dpms.c	23 Apr 2004 18:44:41 -0000	1.2
+++ dpms.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -35,8 +35,11 @@
 
 /* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"

Index: dpmsproc.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/dpmsproc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dpmsproc.h	23 Apr 2004 18:44:41 -0000	1.2
+++ dpmsproc.h	10 Jun 2004 19:39:30 -0000	1.3
@@ -2,6 +2,9 @@
 
 /* Prototypes for functions that the DDX must provide */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _DPMSPROC_H_
 #define _DPMSPROC_H_
 

Index: dpmsstubs.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/dpmsstubs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dpmsstubs.c	23 Apr 2004 18:44:41 -0000	1.2
+++ dpmsstubs.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -30,6 +30,9 @@
 
 typedef int Bool;
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "dpmsproc.h"
 
 #define FALSE 0

Index: fontcache.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/fontcache.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fontcache.c	23 Apr 2004 18:44:41 -0000	1.2
+++ fontcache.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -31,10 +31,13 @@
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +47,7 @@
 #define _FONTCACHE_SERVER_
 #include "fontcacheP.h"
 #include "fontcachstr.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 #include "swaprep.h"
 #include "modinit.h"

Index: mbuf.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/mbuf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mbuf.c	23 Apr 2004 18:44:41 -0000	1.2
+++ mbuf.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -26,10 +26,13 @@
 ********************************************************/
 
 /* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"

Index: mbufbf.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/mbufbf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mbufbf.c	23 Apr 2004 18:44:41 -0000	1.2
+++ mbufbf.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -27,11 +27,14 @@
 
 /* $Xorg: mbufbf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"

Index: mbufpx.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/mbufpx.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mbufpx.c	23 Apr 2004 18:44:41 -0000	1.2
+++ mbufpx.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -26,11 +26,14 @@
 ********************************************************/
 
 /* $Xorg: mbufpx.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"

Index: mitmisc.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/mitmisc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mitmisc.c	23 Apr 2004 18:44:41 -0000	1.2
+++ mitmisc.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -29,15 +29,18 @@
 
 /* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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;

Index: panoramiX.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/panoramiX.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- panoramiX.c	23 Apr 2004 18:44:41 -0000	1.2
+++ panoramiX.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -25,11 +25,14 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +45,7 @@
 #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"

Index: panoramiX.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/panoramiX.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- panoramiX.h	23 Apr 2004 18:44:41 -0000	1.2
+++ panoramiX.h	10 Jun 2004 19:39:30 -0000	1.3
@@ -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.1.4.1.4.2 2004/03/08 00:36:56 alanc Exp $ */
 /*****************************************************************
 
 Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -36,10 +36,13 @@
  *	PanoramiX definitions
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
-#include "panoramiXext.h"
+#include <X11/extensions/panoramiXext.h>
 #include "gcstruct.h"
 
 

Index: panoramiXSwap.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/panoramiXSwap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- panoramiXSwap.c	23 Apr 2004 18:44:41 -0000	1.2
+++ panoramiXSwap.c	10 Jun 2004 19:39:30 -0000	1.3
@@ -25,9 +25,12 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +47,7 @@
 #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"

Index: panoramiXh.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/panoramiXh.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- panoramiXh.h	23 Apr 2004 18:44:41 -0000	1.2
+++ panoramiXh.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -56,6 +56,9 @@
 extern int PanoramiXStoreColors(ClientPtr client);
 extern int PanoramiXAllocColorPlanes(ClientPtr client);
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define PROC_EXTERN(pfunc)      extern int pfunc(ClientPtr)
 
 PROC_EXTERN(ProcPanoramiXQueryVersion); 

Index: panoramiXprocs.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/panoramiXprocs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- panoramiXprocs.c	23 Apr 2004 18:44:41 -0000	1.2
+++ panoramiXprocs.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -28,11 +28,14 @@
 
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"

Index: panoramiXsrv.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/panoramiXsrv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- panoramiXsrv.h	23 Apr 2004 18:44:41 -0000	1.2
+++ panoramiXsrv.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_
 

Index: sampleEVI.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/sampleEVI.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sampleEVI.c	23 Apr 2004 18:44:41 -0000	1.2
+++ sampleEVI.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -23,8 +23,11 @@
 ********************************************************/
 /* $XFree86$ */
 
-#include "X.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "dix.h"

Index: saver.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/saver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- saver.c	23 Apr 2004 18:44:41 -0000	1.2
+++ saver.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -30,10 +30,13 @@
 
 /* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +46,7 @@
 #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"

Index: security.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/security.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- security.c	23 Apr 2004 18:44:41 -0000	1.2
+++ security.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -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.1.4.3.4.1 2004/03/04 17:47:20 eich Exp $ */
 /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 /*
 
@@ -27,6 +27,9 @@
 */
 /* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "windowstr.h"
@@ -48,7 +51,7 @@
 #include "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

Index: shape.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/shape.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shape.c	23 Apr 2004 18:44:41 -0000	1.2
+++ shape.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -27,10 +27,13 @@
 ********************************************************/
 
 /* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +44,7 @@
 #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
@@ -61,7 +64,7 @@
 	pointer /* data */,
 	XID /* id */
 	);
-static void SendShapeNotify(
+void SendShapeNotify(
 	WindowPtr /* pWin */,
 	int /* which */
 	);
@@ -87,8 +90,8 @@
 
 #define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */)
 
-static CREATE_PROC(CreateBoundingShape);
-static CREATE_PROC(CreateClipShape);
+CREATE_PROC(CreateBoundingShape);
+CREATE_PROC(CreateClipShape);
 
 #undef CREATE_PROC
 
@@ -261,7 +264,7 @@
     return Success;
 }
 
-static RegionPtr
+RegionPtr
 CreateBoundingShape (pWin)
     WindowPtr	pWin;
 {
@@ -274,7 +277,7 @@
     return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
 }
 
-static RegionPtr
+RegionPtr
 CreateClipShape (pWin)
     WindowPtr	pWin;
 {
@@ -880,7 +883,7 @@
  * deliver the event
  */
 
-static void
+void
 SendShapeNotify (pWin, which)
     WindowPtr	pWin;
     int		which;

Index: shm.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/shm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- shm.c	23 Apr 2004 18:44:41 -0000	1.2
+++ shm.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/Xext/shm.c,v 1.1.4.5.2.3 2004/03/04 20:16:01 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */
 /************************************************************
 
@@ -29,6 +30,9 @@
 
 /* $Xorg: shm.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define SHM
 
 #include <sys/types.h>
@@ -43,8 +47,8 @@
 #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 +60,9 @@
 #include "extnsionst.h"
 #include "servermd.h"
 #define _XSHM_SERVER_
-#include "shmstr.h"
-#include "Xfuncproto.h"
+#include "shmint.h"
+#include <X11/extensions/shmstr.h>
+#include <X11/Xfuncproto.h>
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif

Index: sleepuntil.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/sleepuntil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sleepuntil.c	23 Apr 2004 18:44:41 -0000	1.2
+++ sleepuntil.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -29,9 +29,12 @@
 
 /* dixsleep.c - implement millisecond timeouts for X clients */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"

Index: sleepuntil.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/sleepuntil.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- sleepuntil.h	25 Nov 2003 19:28:22 -0000	1.1.1.2
+++ sleepuntil.h	10 Jun 2004 19:39:31 -0000	1.2
@@ -25,6 +25,9 @@
  * XFree86 Project.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _SLEEPUNTIL_H_
 #define _SLEEPUNTIL_H_ 1
 

Index: sync.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/sync.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sync.c	23 Apr 2004 18:44:41 -0000	1.2
+++ sync.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -52,11 +52,14 @@
 */
 /* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.13 2003/09/02 18:19:01 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +67,9 @@
 #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>
+#include "syncint.h"
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"

Index: vidmodeproc.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/vidmodeproc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vidmodeproc.h	23 Apr 2004 18:44:41 -0000	1.2
+++ vidmodeproc.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -2,6 +2,9 @@
 
 /* Prototypes for DGA functions that the DDX must provide */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _VIDMODEPROC_H_
 #define _VIDMODEPROC_H_
 

Index: xcmisc.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xcmisc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xcmisc.c	23 Apr 2004 18:44:41 -0000	1.2
+++ xcmisc.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -28,16 +28,19 @@
 */
 /* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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

Index: xf86bigfont.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xf86bigfont.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86bigfont.c	23 Apr 2004 18:44:41 -0000	1.2
+++ xf86bigfont.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -35,6 +35,9 @@
  * XLoadQueryFont).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #ifdef HAS_SHM
 #if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
@@ -60,8 +63,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"

Index: xf86dga.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xf86dga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86dga.c	23 Apr 2004 18:44:41 -0000	1.2
+++ xf86dga.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -7,10 +7,13 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +22,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"
 

Index: xf86dga2.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xf86dga2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86dga2.c	23 Apr 2004 18:44:41 -0000	1.2
+++ xf86dga2.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -6,10 +6,13 @@
 /* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +23,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"

Index: xf86dgaext.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xf86dgaext.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86dgaext.h	23 Apr 2004 18:44:41 -0000	1.2
+++ xf86dgaext.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86DGAEXT_H_
 #define _XF86DGAEXT_H_
 

Index: xf86misc.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xf86misc.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86misc.c	25 Nov 2003 19:28:22 -0000	1.1.1.2
+++ xf86misc.c	10 Jun 2004 19:39:31 -0000	1.2
@@ -6,10 +6,13 @@
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"
@@ -21,7 +24,7 @@
 #include "xf86mscstr.h"
 #include "swaprep.h"
 #include "xf86.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #include "xf86miscproc.h"
 
 #if 0

Index: xf86miscproc.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xf86miscproc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86miscproc.h	23 Apr 2004 18:44:41 -0000	1.2
+++ xf86miscproc.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -2,6 +2,9 @@
 
 /* Prototypes for Pointer/Keyboard functions that the DDX must provide */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86MISCPROC_H_
 #define _XF86MISCPROC_H_
 

Index: xf86vmode.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xf86vmode.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86vmode.c	23 Apr 2004 18:44:41 -0000	1.2
+++ xf86vmode.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -29,14 +29,17 @@
 from Kaleb S. KEITHLEY
 
 */
-/* $XdotOrg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xf86vmode.c,v 1.1.4.3.4.1 2004/03/04 17:47:20 eich 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 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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"

Index: xprint.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xprint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xprint.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xprint.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -66,11 +66,14 @@
 ********************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +81,7 @@
 #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"

Index: xres.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xres.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xres.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xres.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -4,16 +4,20 @@
 /* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
 /* $XdotOrg$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "X.h"
-#include "Xproto.h"
+#define XResExtension
+#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"
 

Index: xtest.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xtest.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xtest.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xtest.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -29,9 +29,12 @@
 */
 /* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#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 +45,11 @@
 #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 */

Index: xtest1dd.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xtest1dd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xtest1dd.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xtest1dd.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -58,18 +58,21 @@
  * include files
  ***************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define	NEED_EVENTS
 #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"
 

Index: xtest1dd.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xtest1dd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xtest1dd.h	23 Apr 2004 18:44:42 -0000	1.2
+++ xtest1dd.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -24,6 +24,9 @@
 
 ********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef XTEST1DD_H
 #define XTEST1DD_H 1
 

Index: xtest1di.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xtest1di.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xtest1di.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xtest1di.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -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.1.4.3.4.1 2004/03/04 17:47:20 eich Exp $ */
 /* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*
  *	File:  xtest1di.c
@@ -59,12 +59,15 @@
  * include files
  ****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define	 NEED_EVENTS
 #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 +75,7 @@
 #include "dixstruct.h"
 #include "opaque.h"
 #define  XTestSERVER_SIDE
-#include "xtestext1.h"
+#include <X11/extensions/xtestext1.h>
 #include "modinit.h"
 
 #include "xtest1dd.h"

Index: xvdisp.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xvdisp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xvdisp.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xvdisp.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -48,8 +48,11 @@
 **
 */
 
-#include "X.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -59,12 +62,12 @@
 #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

Index: xvdix.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xvdix.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xvdix.h	23 Apr 2004 18:44:42 -0000	1.2
+++ xvdix.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -23,6 +23,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef XVDIX_H
 #define XVDIX_H
 /*
@@ -54,7 +57,7 @@
 */
 
 #include "scrnintstr.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xvproto.h>
 
 extern int  XvScreenIndex;
 extern unsigned long XvExtensionGeneration;

Index: xvmain.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xvmain.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xvmain.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xvmain.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -75,8 +75,11 @@
 **
 */
 
-#include "X.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "scrnintstr.h"
@@ -91,8 +94,8 @@
 
 #define GLOBAL
 
-#include "Xv.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 
 #ifdef EXTMODULE

Index: xvmc.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xvmc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xvmc.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xvmc.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -1,9 +1,12 @@
 /* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +14,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"
 
 int XvMCScreenIndex = -1;

Index: xvmcext.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xvmcext.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xvmcext.h	23 Apr 2004 18:44:42 -0000	1.2
+++ xvmcext.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -1,8 +1,11 @@
 /* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XVMC_H
 #define _XVMC_H
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "xvdix.h"
 
 typedef struct {

Index: xvmod.c
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xvmod.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xvmod.c	23 Apr 2004 18:44:42 -0000	1.2
+++ xvmod.c	10 Jun 2004 19:39:31 -0000	1.3
@@ -1,11 +1,14 @@
 /* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#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"
 

Index: xvmodproc.h
===================================================================
RCS file: /cvs/xserver/debrix/Xext/xvmodproc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xvmodproc.h	23 Apr 2004 18:44:42 -0000	1.2
+++ xvmodproc.h	10 Jun 2004 19:39:31 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xvmcext.h"
 
 extern int (*XvGetScreenIndexProc)(void);

More information about the xserver-commit mailing list