[PATCH][1/1] - Xserver - Xext - prep sources for config.h inclusion + fix shm and xvdisp header issues

Shawn Starr shawn.starr at rogers.com
Mon Apr 18 21:53:18 PDT 2005 

- Prep some of the sources to include config.h for other #defines that may be 
set by the autotools.

- Fix shm, xvdisp. SHM struct is protocol, move back to the protocol header. Comment code out for now.

diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/EVI.c modular/xorg/Xserver/Xext/EVI.c
--- monolithic/xc/programs/Xserver/Xext/EVI.c 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/EVI.c 2005-04-17 16:18:13.000000000 -0400
@@ -23,8 +23,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $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"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/EVIstruct.h modular/xorg/Xserver/Xext/EVIstruct.h
--- monolithic/xc/programs/Xserver/Xext/EVIstruct.h 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/EVIstruct.h 2005-04-17 16:18:39.000000000 -0400
@@ -23,6 +23,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $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
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/appgroup.c modular/xorg/Xserver/Xext/appgroup.c
--- monolithic/xc/programs/Xserver/Xext/appgroup.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/appgroup.c 2005-04-17 16:34:10.000000000 -0400
@@ -26,10 +26,13 @@ from The Open Group.
 */
 /* $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"
@@ -41,8 +44,8 @@ from The Open Group.
 #include "Xagstr.h"
 #include "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>
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/bigreq.c modular/xorg/Xserver/Xext/bigreq.c
--- monolithic/xc/programs/Xserver/Xext/bigreq.c 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/bigreq.c 2005-04-17 18:10:28.000000000 -0400
@@ -28,14 +28,17 @@ from The Open Group.
 */
 /* $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"
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/cup.c modular/xorg/Xserver/Xext/cup.c
--- monolithic/xc/programs/Xserver/Xext/cup.c 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/cup.c 2005-04-19 00:24:56.000000000 -0400
@@ -26,10 +26,13 @@ in this Software without prior written a
 */
 /* $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"
@@ -38,8 +41,8 @@ in this Software without prior written a
 #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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/dgaproc.h modular/xorg/Xserver/Xext/dgaproc.h
--- monolithic/xc/programs/Xserver/Xext/dgaproc.h	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/dgaproc.h	2005-04-17 16:36:21.000000000 -0400
@@ -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
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/dmx.c modular/xorg/Xserver/Xext/dmx.c
--- monolithic/xc/programs/Xserver/Xext/dmx.c	2004-08-27 16:39:17.000000000 -0400
+++ modular/xorg/Xserver/Xext/dmx.c	2005-04-17 16:39:51.000000000 -0400
@@ -43,8 +43,11 @@
  * Please see the Client-to-Server DMX Extension to the X Protocol
  * document for details about the protocol.  */
 
-#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"
@@ -52,11 +55,11 @@
 #include "extnsionst.h"
 #include "opaque.h"
 
-#include "dmxextension.h"
-#include "dmxproto.h"
+#include "../hw/dmx/dmxextension.h"
+#include <X11/extensions/dmxproto.h>
 
 #define _DMX_SERVER_
-#include "dmxext.h"
+#include <X11/extensions/dmxext.h>
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/dpms.c modular/xorg/Xserver/Xext/dpms.c
--- monolithic/xc/programs/Xserver/Xext/dpms.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/dpms.c	2005-04-17 16:40:55.000000000 -0400
@@ -35,16 +35,19 @@ Equipment Corporation.
 
 /* $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"
 #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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/dpmsproc.h modular/xorg/Xserver/Xext/dpmsproc.h
--- monolithic/xc/programs/Xserver/Xext/dpmsproc.h 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/dpmsproc.h 2005-04-17 16:41:29.000000000 -0400
@@ -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_
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/dpmsstubs.c modular/xorg/Xserver/Xext/dpmsstubs.c
--- monolithic/xc/programs/Xserver/Xext/dpmsstubs.c 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/dpmsstubs.c 2005-04-17 16:41:54.000000000 -0400
@@ -30,6 +30,9 @@ Equipment Corporation.
 
 typedef int Bool;
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "dpmsproc.h"
 
 #define FALSE 0
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/extmod/modinit.c modular/xorg/Xserver/Xext/extmod/modinit.c
--- monolithic/xc/programs/Xserver/Xext/extmod/modinit.c 2004-04-23 14:44:43.000000000 -0400
+++ modular/xorg/Xserver/Xext/extmod/modinit.c 2005-04-17 16:42:31.000000000 -0400
@@ -23,13 +23,16 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 #include "xf86_ansic.h"
 
 #include "xf86Module.h"
 #include "xf86Opt.h"
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 
 #include "modinit.h"
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/extmod/modinit.h modular/xorg/Xserver/Xext/extmod/modinit.h
--- monolithic/xc/programs/Xserver/Xext/extmod/modinit.h 2004-04-23 14:44:43.000000000 -0400
+++ modular/xorg/Xserver/Xext/extmod/modinit.h 2005-04-18 21:02:16.000000000 -0400
@@ -1,6 +1,9 @@
 /* $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 $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef INITARGS
 #define INITARGS void
 #endif
@@ -8,26 +11,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,86 +39,87 @@ 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
 extern void FontCacheExtensionInit(INITARGS);
 #define _FONTCACHE_SERVER_
-#include "fontcacheP.h"
-#include "fontcachstr.h"
+#include <X11/extensions/fontcacheP.h>
+#include <X11/extensions/fontcachstr.h>
 #endif
 
 #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"
+#define _XSHM_SERVER_
+#include <X11/extensions/shmstr.h>
 extern void ShmSetPixmapFormat(
     ScreenPtr pScreen,
     int format);
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/fontcache.c modular/xorg/Xserver/Xext/fontcache.c
--- monolithic/xc/programs/Xserver/Xext/fontcache.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/fontcache.c	2005-04-19 00:19:05.000000000 -0400
@@ -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"
@@ -42,9 +45,9 @@
 #include "inputstr.h"
 #include "servermd.h"
 #define _FONTCACHE_SERVER_
-#include "fontcacheP.h"
-#include "fontcachstr.h"
-#include "Xfuncproto.h"
+#include <X11/extensions/fontcacheP.h>
+#include <X11/extensions/fontcachstr.h>
+#include <X11/Xfuncproto.h>
 
 #include "swaprep.h"
 #include "modinit.h"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/mbuf.c modular/xorg/Xserver/Xext/mbuf.c
--- monolithic/xc/programs/Xserver/Xext/mbuf.c 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/mbuf.c 2005-04-17 17:01:28.000000000 -0400
@@ -26,10 +26,13 @@ in this Software without prior written a
 ********************************************************/
 
 /* $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"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/mbufbf.c modular/xorg/Xserver/Xext/mbufbf.c
--- monolithic/xc/programs/Xserver/Xext/mbufbf.c 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/mbufbf.c 2005-04-17 17:02:26.000000000 -0400
@@ -27,11 +27,14 @@ in this Software without prior written a
 
 /* $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"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/mbufpx.c modular/xorg/Xserver/Xext/mbufpx.c
--- monolithic/xc/programs/Xserver/Xext/mbufpx.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/mbufpx.c	2005-04-17 17:03:17.000000000 -0400
@@ -26,11 +26,14 @@ in this Software without prior written a
 ********************************************************/
 
 /* $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"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/mitmisc.c modular/xorg/Xserver/Xext/mitmisc.c
--- monolithic/xc/programs/Xserver/Xext/mitmisc.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/mitmisc.c	2005-04-17 17:04:06.000000000 -0400
@@ -29,15 +29,18 @@ in this Software without prior written a
 
 /* $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;
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/panoramiX.c modular/xorg/Xserver/Xext/panoramiX.c
--- monolithic/xc/programs/Xserver/Xext/panoramiX.c	2004-06-30 16:06:53.000000000 -0400
+++ modular/xorg/Xserver/Xext/panoramiX.c	2005-04-17 17:05:15.000000000 -0400
@@ -25,11 +25,14 @@ Equipment Corporation.
 ******************************************************************/
 /* $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 @@ 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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/panoramiX.h modular/xorg/Xserver/Xext/panoramiX.h
--- monolithic/xc/programs/Xserver/Xext/panoramiX.h	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/panoramiX.h	2005-04-17 17:05:35.000000000 -0400
@@ -36,10 +36,13 @@ Equipment Corporation.
  *	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"
 
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/panoramiXSwap.c modular/xorg/Xserver/Xext/panoramiXSwap.c
--- monolithic/xc/programs/Xserver/Xext/panoramiXSwap.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/panoramiXSwap.c	2005-04-18 21:09:25.000000000 -0400
@@ -25,9 +25,12 @@ Equipment Corporation.
 ******************************************************************/
 /* $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 @@ 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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/panoramiXh.h modular/xorg/Xserver/Xext/panoramiXh.h
--- monolithic/xc/programs/Xserver/Xext/panoramiXh.h	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/panoramiXh.h	2005-04-17 17:13:32.000000000 -0400
@@ -56,6 +56,9 @@ extern int PanoramiXFreeColors(ClientPtr
 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); 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/panoramiXprocs.c modular/xorg/Xserver/Xext/panoramiXprocs.c
--- monolithic/xc/programs/Xserver/Xext/panoramiXprocs.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/panoramiXprocs.c	2005-04-17 17:14:14.000000000 -0400
@@ -28,11 +28,14 @@ Equipment Corporation.
 
 /* $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"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/panoramiXsrv.h modular/xorg/Xserver/Xext/panoramiXsrv.h
--- monolithic/xc/programs/Xserver/Xext/panoramiXsrv.h	2004-06-30 16:06:53.000000000 -0400
+++ modular/xorg/Xserver/Xext/panoramiXsrv.h	2005-04-17 17:14:55.000000000 -0400
@@ -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_
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/sampleEVI.c modular/xorg/Xserver/Xext/sampleEVI.c
--- monolithic/xc/programs/Xserver/Xext/sampleEVI.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/sampleEVI.c	2005-04-17 17:16:51.000000000 -0400
@@ -23,13 +23,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $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"
 #define _XEVI_SERVER_
-#include "XEVIstr.h"
+#include <X11/extensions/XEVIstr.h>
 #include "EVIstruct.h"
 #include "scrnintstr.h"
 static int sampleGetVisualInfo(
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/saver.c modular/xorg/Xserver/Xext/saver.c
--- monolithic/xc/programs/Xserver/Xext/saver.c	2005-03-23 16:09:48.000000000 -0500
+++ modular/xorg/Xserver/Xext/saver.c	2005-04-17 17:17:56.000000000 -0400
@@ -30,10 +30,13 @@ in this Software without prior written a
 
 /* $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 @@ in this Software without prior written a
 #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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/security.c modular/xorg/Xserver/Xext/security.c
--- monolithic/xc/programs/Xserver/Xext/security.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/security.c	2005-04-18 21:05:35.000000000 -0400
@@ -27,6 +27,9 @@ in this Software without prior written a
 */
 /* $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"
@@ -36,7 +39,7 @@ in this Software without prior written a
 #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
@@ -48,7 +51,7 @@ extern unsigned char LbxReqCode;
 #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
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/shape.c modular/xorg/Xserver/Xext/shape.c
--- monolithic/xc/programs/Xserver/Xext/shape.c	2004-07-29 19:43:39.000000000 -0400
+++ modular/xorg/Xserver/Xext/shape.c	2005-04-17 17:20:35.000000000 -0400
@@ -27,10 +27,13 @@ in this Software without prior written a
 ********************************************************/
 
 /* $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 @@ in this Software without prior written a
 #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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/shm.c modular/xorg/Xserver/Xext/shm.c
--- monolithic/xc/programs/Xserver/Xext/shm.c 2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/shm.c 2005-04-18 21:06:42.000000000 -0400
@@ -29,6 +29,9 @@ in this Software without prior written a
 
 /* $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 +46,8 @@ in this Software without prior written a
 #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 +59,8 @@ in this Software without prior written a
 #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
@@ -69,69 +72,71 @@ in this Software without prior written a
 
 #include "modinit.h"
 
-typedef struct _ShmDesc {
-    struct _ShmDesc *next;
-    int shmid;
-    int refcnt;
-    char *addr;
-    Bool writable;
-    unsigned long size;
-} ShmDescRec, *ShmDescPtr;
-
-static void miShmPutImage(XSHM_PUT_IMAGE_ARGS);
-static void fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
-static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
-static int ShmDetachSegment(
-    pointer		/* value */,
-    XID			/* shmseg */
-    );
-static void ShmResetProc(
-    ExtensionEntry *	/* extEntry */
-    );
-static void SShmCompletionEvent(
-    xShmCompletionEvent * /* from */,
-    xShmCompletionEvent * /* to */
-    );
-
-static Bool ShmDestroyPixmap (PixmapPtr pPixmap);
-
-static DISPATCH_PROC(ProcShmAttach);
-static DISPATCH_PROC(ProcShmCreatePixmap);
-static DISPATCH_PROC(ProcShmDetach);
-static DISPATCH_PROC(ProcShmDispatch);
-static DISPATCH_PROC(ProcShmGetImage);
-static DISPATCH_PROC(ProcShmPutImage);
-static DISPATCH_PROC(ProcShmQueryVersion);
-static DISPATCH_PROC(SProcShmAttach);
-static DISPATCH_PROC(SProcShmCreatePixmap);
-static DISPATCH_PROC(SProcShmDetach);
-static DISPATCH_PROC(SProcShmDispatch);
-static DISPATCH_PROC(SProcShmGetImage);
-static DISPATCH_PROC(SProcShmPutImage);
-static DISPATCH_PROC(SProcShmQueryVersion);
-
-static unsigned char ShmReqCode;
-int ShmCompletionCode;
-int BadShmSegCode;
-RESTYPE ShmSegType;
-static ShmDescPtr Shmsegs;
-static Bool sharedPixmaps;
-static int pixmapFormat;
-static int shmPixFormat[MAXSCREENS];
-static ShmFuncsPtr shmFuncs[MAXSCREENS];
-static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
+/* XXX: Move back to protocol headers for now.. Post 7.0+
+	typedef struct _ShmDesc {
+	    struct _ShmDesc *next;
+	    int shmid;
+	    int refcnt;
+	    char *addr;
+	    Bool writable;
+	    unsigned long size;
+	} ShmDescRec, *ShmDescPtr;
+*/
+
+	static void miShmPutImage(XSHM_PUT_IMAGE_ARGS);
+	static void fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
+	static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
+	static int ShmDetachSegment(
+	    pointer		/* value */,
+	    XID			/* shmseg */
+	    );
+	static void ShmResetProc(
+	    ExtensionEntry *	/* extEntry */
+	    );
+	static void SShmCompletionEvent(
+	    xShmCompletionEvent * /* from */,
+	    xShmCompletionEvent * /* to */
+	    );
+
+	static Bool ShmDestroyPixmap (PixmapPtr pPixmap);
+
+	static DISPATCH_PROC(ProcShmAttach);
+	static DISPATCH_PROC(ProcShmCreatePixmap);
+	static DISPATCH_PROC(ProcShmDetach);
+	static DISPATCH_PROC(ProcShmDispatch);
+	static DISPATCH_PROC(ProcShmGetImage);
+	static DISPATCH_PROC(ProcShmPutImage);
+	static DISPATCH_PROC(ProcShmQueryVersion);
+	static DISPATCH_PROC(SProcShmAttach);
+	static DISPATCH_PROC(SProcShmCreatePixmap);
+	static DISPATCH_PROC(SProcShmDetach);
+	static DISPATCH_PROC(SProcShmDispatch);
+	static DISPATCH_PROC(SProcShmGetImage);
+	static DISPATCH_PROC(SProcShmPutImage);
+	static DISPATCH_PROC(SProcShmQueryVersion);
+
+	static unsigned char ShmReqCode;
+	int ShmCompletionCode;
+	int BadShmSegCode;
+	RESTYPE ShmSegType;
+	static ShmDescPtr Shmsegs;
+	static Bool sharedPixmaps;
+	static int pixmapFormat;
+	static int shmPixFormat[MAXSCREENS];
+	static ShmFuncsPtr shmFuncs[MAXSCREENS];
+	static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
 #ifdef PIXPRIV
-static int  shmPixmapPrivate;
+	static int  shmPixmapPrivate;
 #endif
-static ShmFuncs miFuncs = {NULL, miShmPutImage};
-static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
+	static ShmFuncs miFuncs = {NULL, miShmPutImage};
+	static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
 
 #define VERIFY_SHMSEG(shmseg,shmdesc,client) \
-{ \
-    shmdesc = (ShmDescPtr)LookupIDByType(shmseg, ShmSegType); \
-    if (!shmdesc) \
-    { \
-	client->errorValue = shmseg; \
+	{ \
+	    shmdesc = (ShmDescPtr)LookupIDByType(shmseg, ShmSegType); \
+	    if (!shmdesc) \
+	    { \
+		client->errorValue = shmseg; \
 	return BadShmSegCode; \
     } \
 }
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/sleepuntil.c modular/xorg/Xserver/Xext/sleepuntil.c
--- monolithic/xc/programs/Xserver/Xext/sleepuntil.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/sleepuntil.c	2005-04-17 17:22:54.000000000 -0400
@@ -29,9 +29,12 @@ in this Software without prior written a
 
 /* 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"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/sleepuntil.h modular/xorg/Xserver/Xext/sleepuntil.h
--- monolithic/xc/programs/Xserver/Xext/sleepuntil.h	2003-11-25 14:28:22.000000000 -0500
+++ modular/xorg/Xserver/Xext/sleepuntil.h	2005-04-17 17:23:09.000000000 -0400
@@ -25,6 +25,9 @@
  * XFree86 Project.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _SLEEPUNTIL_H_
 #define _SLEEPUNTIL_H_ 1
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/sync.c modular/xorg/Xserver/Xext/sync.c
--- monolithic/xc/programs/Xserver/Xext/sync.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/sync.c	2005-04-17 18:35:52.000000000 -0400
@@ -52,11 +52,14 @@ PERFORMANCE OF THIS SOFTWARE.
 */
 /* $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,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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/vidmodeproc.h modular/xorg/Xserver/Xext/vidmodeproc.h
--- monolithic/xc/programs/Xserver/Xext/vidmodeproc.h	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/vidmodeproc.h	2005-04-17 17:24:31.000000000 -0400
@@ -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_
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xcmisc.c modular/xorg/Xserver/Xext/xcmisc.c
--- monolithic/xc/programs/Xserver/Xext/xcmisc.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/xcmisc.c	2005-04-17 17:25:05.000000000 -0400
@@ -28,16 +28,19 @@ from The Open Group.
 */
 /* $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
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xevie.c modular/xorg/Xserver/Xext/xevie.c
--- monolithic/xc/programs/Xserver/Xext/xevie.c	2004-07-30 21:34:26.000000000 -0400
+++ modular/xorg/Xserver/Xext/xevie.c	2005-04-17 17:25:54.000000000 -0400
@@ -31,10 +31,13 @@ of the copyright holder.
 
 ************************************************************/
 
+#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,8 +45,8 @@ of the copyright holder.
 #include "scrnintstr.h"
 #include "servermd.h"
 #define  _XEVIE_SERVER_
-#include "Xeviestr.h"
-#include "Xfuncproto.h"
+#include <X11/extensions/Xeviestr.h>
+#include <X11/Xfuncproto.h>
 #include "input.h"
 
 #include "../os/osdep.h"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xf86bigfont.c modular/xorg/Xserver/Xext/xf86bigfont.c
--- monolithic/xc/programs/Xserver/Xext/xf86bigfont.c 2004-09-20 04:44:54.000000000 -0400
+++ modular/xorg/Xserver/Xext/xf86bigfont.c 2005-04-17 17:26:55.000000000 -0400
@@ -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"
@@ -70,7 +73,7 @@
 #include "extnsionst.h"
 
 #define _XF86BIGFONT_SERVER_
-#include "xf86bigfstr.h"
+#include <X11/extensions/xf86bigfstr.h>
 
 static void XF86BigfontResetProc(
     ExtensionEntry *	/* extEntry */
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xf86dga.c modular/xorg/Xserver/Xext/xf86dga.c
--- monolithic/xc/programs/Xserver/Xext/xf86dga.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/xf86dga.c	2005-04-17 17:27:47.000000000 -0400
@@ -7,10 +7,13 @@ Copyright (c) 1995, 1996, 1999  XFree86 
 
 */
 
+#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 @@ Copyright (c) 1995, 1996, 1999  XFree86 
 #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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xf86dga2.c modular/xorg/Xserver/Xext/xf86dga2.c
--- monolithic/xc/programs/Xserver/Xext/xf86dga2.c	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/xf86dga2.c	2005-04-17 17:29:14.000000000 -0400
@@ -5,11 +5,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 +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"
 #include "xf86dgaext.h"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xf86dgaext.h modular/xorg/Xserver/Xext/xf86dgaext.h
--- monolithic/xc/programs/Xserver/Xext/xf86dgaext.h	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/xf86dgaext.h	2005-04-17 17:29:32.000000000 -0400
@@ -1,5 +1,8 @@
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86DGAEXT_H_
 #define _XF86DGAEXT_H_
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xf86misc.c modular/xorg/Xserver/Xext/xf86misc.c
--- monolithic/xc/programs/Xserver/Xext/xf86misc.c	2004-12-15 10:05:35.000000000 -0500
+++ modular/xorg/Xserver/Xext/xf86misc.c	2005-04-17 17:30:24.000000000 -0400
@@ -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"
@@ -18,10 +21,10 @@
 #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
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xf86miscproc.h modular/xorg/Xserver/Xext/xf86miscproc.h
--- monolithic/xc/programs/Xserver/Xext/xf86miscproc.h	2004-04-23 14:44:41.000000000 -0400
+++ modular/xorg/Xserver/Xext/xf86miscproc.h	2005-04-17 17:31:00.000000000 -0400
@@ -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_
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xf86vmode.c modular/xorg/Xserver/Xext/xf86vmode.c
--- monolithic/xc/programs/Xserver/Xext/xf86vmode.c	2004-12-12 18:29:20.000000000 -0500
+++ modular/xorg/Xserver/Xext/xf86vmode.c	2005-04-17 17:41:59.000000000 -0400
@@ -33,17 +33,20 @@ from Kaleb S. KEITHLEY
 /* $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"
 #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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xprint.c modular/xorg/Xserver/Xext/xprint.c
--- monolithic/xc/programs/Xserver/Xext/xprint.c 2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xprint.c 2005-04-19 00:33:28.000000000 -0400
@@ -66,11 +66,14 @@ copyright holders.
 ********************************************************************/
 /* $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,9 +81,9 @@ copyright holders.
 #include "pixmapstr.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
-#include "Xatom.h"
-#include "Print.h"
-#include "Printstr.h"
+#include <X11/Xatom.h>
+#include <X11/extensions/Print.h>
+#include <X11/extensions/Printstr.h>
 #include "../Xprint/DiPrint.h"
 #include "../Xprint/attributes.h"
 #include "modinit.h"
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xres.c modular/xorg/Xserver/Xext/xres.c
--- monolithic/xc/programs/Xserver/Xext/xres.c	2004-12-15 15:51:25.000000000 -0500
+++ modular/xorg/Xserver/Xext/xres.c	2005-04-17 17:44:34.000000000 -0400
@@ -4,16 +4,19 @@
 /* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
 /* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.3 2004/12/15 20:51:25 herrb 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 "XResproto.h"
+#include <X11/extensions/XResproto.h>
 #include "pixmapstr.h"
 #include "modinit.h"
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xtest.c modular/xorg/Xserver/Xext/xtest.c
--- monolithic/xc/programs/Xserver/Xext/xtest.c	2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xtest.c	2005-04-17 17:54:16.000000000 -0400
@@ -29,9 +29,12 @@ 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"
+#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 @@ 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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xtest1dd.c modular/xorg/Xserver/Xext/xtest1dd.c
--- monolithic/xc/programs/Xserver/Xext/xtest1dd.c	2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xtest1dd.c	2005-04-17 17:56:08.000000000 -0400
@@ -58,18 +58,21 @@ University of California.
  * 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"
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xtest1dd.h modular/xorg/Xserver/Xext/xtest1dd.h
--- monolithic/xc/programs/Xserver/Xext/xtest1dd.h	2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xtest1dd.h	2005-04-17 17:56:24.000000000 -0400
@@ -24,6 +24,9 @@ OR IN CONNECTION WITH THE USE OR PERFORM
 
 ********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef XTEST1DD_H
 #define XTEST1DD_H 1
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xtest1di.c modular/xorg/Xserver/Xext/xtest1di.c
--- monolithic/xc/programs/Xserver/Xext/xtest1di.c 2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xtest1di.c 2005-04-17 17:57:39.000000000 -0400
@@ -59,12 +59,15 @@ University of California.
  * 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 @@ 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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xvdisp.c modular/xorg/Xserver/Xext/xvdisp.c
--- monolithic/xc/programs/Xserver/Xext/xvdisp.c	2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xvdisp.c	2005-04-18 21:07:52.000000000 -0400
@@ -48,8 +48,11 @@ SOFTWARE.
 **
 */
 
-#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 @@ 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
@@ -1104,6 +1107,7 @@ ProcXvPutImage(ClientPtr client)
 
 #ifdef MITSHM
 /* redefined here since it's not in any header file */
+/* XXX: Moved back to protocol headers 
 typedef struct _ShmDesc {
     struct _ShmDesc *next;
     int shmid;
@@ -1112,6 +1116,7 @@ typedef struct _ShmDesc {
     Bool writable;
     unsigned long size;
 } ShmDescRec, *ShmDescPtr;
+*/
 
 extern RESTYPE ShmSegType;
 extern int BadShmSegCode;
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xvdix.h modular/xorg/Xserver/Xext/xvdix.h
--- monolithic/xc/programs/Xserver/Xext/xvdix.h	2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xvdix.h	2005-04-17 18:03:47.000000000 -0400
@@ -53,8 +53,11 @@ SOFTWARE.
 **
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "scrnintstr.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xvproto.h>
 
 extern int  XvScreenIndex;
 extern unsigned long XvExtensionGeneration;
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xvmain.c modular/xorg/Xserver/Xext/xvmain.c
--- monolithic/xc/programs/Xserver/Xext/xvmain.c	2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xvmain.c	2005-04-17 18:04:51.000000000 -0400
@@ -75,8 +75,11 @@ SOFTWARE.
 **
 */
 
-#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 @@ 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 -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xvmc.c modular/xorg/Xserver/Xext/xvmc.c
--- monolithic/xc/programs/Xserver/Xext/xvmc.c 2004-11-24 04:07:58.000000000 -0500
+++ modular/xorg/Xserver/Xext/xvmc.c 2005-04-17 18:07:37.000000000 -0400
@@ -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"
 
 #ifdef HAS_XVMCSHM
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xvmcext.h modular/xorg/Xserver/Xext/xvmcext.h
--- monolithic/xc/programs/Xserver/Xext/xvmcext.h 2004-11-13 06:09:23.000000000 -0500
+++ modular/xorg/Xserver/Xext/xvmcext.h 2005-04-18 21:07:08.000000000 -0400
@@ -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 {
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xvmod.c modular/xorg/Xserver/Xext/xvmod.c
--- monolithic/xc/programs/Xserver/Xext/xvmod.c 2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xvmod.c 2005-04-17 18:09:59.000000000 -0400
@@ -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"
 
diff -Nrup --exclude Makefile.am --exclude Makefile.am.inc --exclude CVS monolithic/xc/programs/Xserver/Xext/xvmodproc.h modular/xorg/Xserver/Xext/xvmodproc.h
--- monolithic/xc/programs/Xserver/Xext/xvmodproc.h 2004-04-23 14:44:42.000000000 -0400
+++ modular/xorg/Xserver/Xext/xvmodproc.h 2005-04-17 18:10:14.000000000 -0400
@@ -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);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-modular/attachments/20050419/f806105c/attachment-0001.pgp

More information about the xorg-modular mailing list