debrix/hw/xorg/common atKeynames.h, 1.1.1.2, 1.2 compiler.h, 1.2, 1.3 fourcc.h, 1.1.1.2, 1.2 scoasm.h, 1.1.1.2, 1.2 xf86.h, 1.1.1.3, 1.2 xf86AutoConfig.c, 1.2, 1.3 xf86Beta.c, 1.2, 1.3 xf86Bus.c, 1.1.1.3, 1.2 xf86Bus.h, 1.1.1.2, 1.2 xf86Config.c, 1.2, 1.3 xf86Config.h, 1.1.1.2, 1.2 xf86Configure.c, 1.3, 1.4 xf86Cursor.c, 1.1.1.2, 1.2 xf86DGA.c, 1.2, 1.3 xf86DPMS.c, 1.1.1.2, 1.2 xf86Debug.c, 1.1.1.2, 1.2 xf86DefModes.c, 1.2, 1.3 xf86DoProbe.c, 1.1.1.2, 1.2 xf86DoScanPci.c, 1.1.1.2, 1.2 xf86Events.c, 1.2, 1.3 xf86Globals.c, 1.1.1.6, 1.2 xf86Helper.c, 1.1.1.3, 1.2 xf86InPriv.h, 1.1.1.2, 1.2 xf86Init.c, 1.2, 1.3 xf86Io.c, 1.1.1.2, 1.2 xf86Kbd.c, 1.1.1.2, 1.2 xf86KbdBSD.c, 1.1.1.2, 1.2 xf86KbdLnx.c, 1.1.1.2, 1.2 xf86KbdMach.c, 1.2, 1.3 xf86Keymap.h, 1.1.1.2, 1.2 xf86MiscExt.c, 1.1.1.2, 1.2 xf86Mode.c, 1.2, 1.3 xf86Module.h, 1.2, 1.3 xf86Opt.h, 1.1.1.2, 1.2 xf86Option.c, 1.1.1.2, 1.2 xf86PM.c, 1.1.1.2, 1.2 xf86PciInfo.h, 1.1.1.2, 1.2 xf86Priv.h, 1.1.1.3, 1.2 xf86Privstr.h, 1.1.1.3, 1.2 xf86RandR.c, 1.2, 1.3 xf86Resources.h, 1.1.1.2, 1.2 xf86Versions.c, 1.1.1.1, 1.2 xf86VidMode.c, 1.1.1.2, 1.2 xf86XKB.c, 1.1.1.2, 1.2 xf86Xinput.c, 1.1.1.2, 1.2 xf86Xinput.h, 1.1.1.2, 1.2 xf86cmap.c, 1.2, 1.3 xf86cmap.h, 1.1.1.2, 1.2 xf86fbBus.c, 1.1.1.2, 1.2 xf86fbman.c, 1.1.1.2, 1.2 xf86fbman.h, 1.1.1.2, 1.2 xf86isaBus.c, 1.1.1.2, 1.2 xf86noBus.c, 1.1.1.2, 1.2 xf86pciBus.c, 1.2, 1.3 xf86pciBus.h, 1.1.1.2, 1.2 xf86sbusBus.c, 1.2, 1.3 xf86sbusBus.h, 1.2, 1.3 xf86str.h, 1.1.1.2, 1.2 xf86xv.c, 1.2, 1.3 xf86xv.h, 1.1.1.2, 1.2 xf86xvmc.c, 1.1.1.2, 1.2 xf86xvmc.h, 1.1.1.2, 1.2 xf86xvpriv.h, 1.1.1.1, 1.2 xisb.c, 1.2, 1.3 xisb.h, 1.2, 1.3 xorgHelper.c, 1.2, 1.3

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

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg/common
In directory pdx:/home/daniel/x/debrix/debrix/hw/xorg/common

Modified Files:
	atKeynames.h compiler.h fourcc.h scoasm.h xf86.h 
	xf86AutoConfig.c xf86Beta.c xf86Bus.c xf86Bus.h xf86Config.c 
	xf86Config.h xf86Configure.c xf86Cursor.c xf86DGA.c xf86DPMS.c 
	xf86Debug.c xf86DefModes.c xf86DoProbe.c xf86DoScanPci.c 
	xf86Events.c xf86Globals.c xf86Helper.c xf86InPriv.h 
	xf86Init.c xf86Io.c xf86Kbd.c xf86KbdBSD.c xf86KbdLnx.c 
	xf86KbdMach.c xf86Keymap.h xf86MiscExt.c xf86Mode.c 
	xf86Module.h xf86Opt.h xf86Option.c xf86PM.c xf86PciInfo.h 
	xf86Priv.h xf86Privstr.h xf86RandR.c xf86Resources.h 
	xf86Versions.c xf86VidMode.c xf86XKB.c xf86Xinput.c 
	xf86Xinput.h xf86cmap.c xf86cmap.h xf86fbBus.c xf86fbman.c 
	xf86fbman.h xf86isaBus.c xf86noBus.c xf86pciBus.c xf86pciBus.h 
	xf86sbusBus.c xf86sbusBus.h xf86str.h xf86xv.c xf86xv.h 
	xf86xvmc.c xf86xvmc.h xf86xvpriv.h xisb.c xisb.h xorgHelper.c 
Log Message:
Initial import from modular sources.


Index: atKeynames.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/atKeynames.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- atKeynames.h	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ atKeynames.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -50,13 +50,16 @@
 
 /* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _ATKEYNAMES_H
 #define _ATKEYNAMES_H
 
 #define XK_TECHNICAL
 #define	XK_KATAKANA
-#include "keysym.h"
-#include "XF86keysym.h"
+#include <X11/keysym.h>
+#include <X11/XF86keysym.h>
 
 #define GLYPHS_PER_KEY	4
 #define NUM_KEYCODES	248

Index: compiler.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/compiler.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compiler.h	23 Apr 2004 19:20:32 -0000	1.2
+++ compiler.h	10 Jun 2004 19:40:04 -0000	1.3
@@ -50,6 +50,9 @@
 
 /* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _COMPILER_H
 
 # if !defined(_XF86_ANSIC_H) && defined(XFree86Module)

Index: fourcc.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/fourcc.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- fourcc.h	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ fourcc.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -34,6 +34,9 @@
    For an explanation of fourcc <-> guid mappings see RFC2361.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_FOURCC_H_
 #define _XF86_FOURCC_H_ 1
 

Index: scoasm.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/scoasm.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- scoasm.h	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ scoasm.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,6 +31,9 @@
  * scoasm.h - used to define inline versions of certain functions which
  * do NOT appear in sys/inline.h.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef SCO325
 #ifndef _SCOASM_HDR_INC
 #define _SCOASM_HDR_INC

Index: xf86.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86.h,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- xf86.h	29 Jan 2004 08:08:26 -0000	1.1.1.3
+++ xf86.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -37,6 +37,10 @@
 #ifndef _XF86_H
 #define _XF86_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "modularDefs.h"
 #include "xf86str.h"
 #include "xf86Opt.h"
 #include <X11/Xfuncproto.h>

Index: xf86AutoConfig.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86AutoConfig.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86AutoConfig.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86AutoConfig.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -33,6 +33,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.2 2003/11/03 05:11:01 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86Parser.h"
 #include "xf86tokens.h"

Index: xf86Beta.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Beta.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86Beta.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86Beta.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -1,5 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Beta.c,v 3.10 2003/08/24 17:36:49 dawes Exp $ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Beta.c,v 1.1.4.1.6.1 2004/03/04 11:08:31 eich Exp $ */
 /*
  * Copyright (c) 1996-2002 by The XFree86 Project, Inc.
  *
@@ -49,6 +49,9 @@
  * message.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

Index: xf86Bus.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Bus.c,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- xf86Bus.c	23 Feb 2004 20:35:01 -0000	1.1.1.3
+++ xf86Bus.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define REDUCER
 /*
  * This file contains the interfaces to the bus-specific code
@@ -34,7 +37,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86Bus.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Bus.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Bus.h	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86Bus.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -33,6 +33,9 @@
  * video drivers must not include this file.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_BUS_H
 #define _XF86_BUS_H
 

Index: xf86Config.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86Config.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86Config.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -46,6 +46,9 @@
  *      ... and others
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XF86DRI
 #include <sys/types.h>
 #include <grp.h>
@@ -71,7 +74,7 @@
 
 #ifdef XKB
 #define XKB_IN_SERVER
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 
 #ifdef RENDER
@@ -110,7 +113,7 @@
 			"%P/lib/X11/%X"
 #endif
 #ifndef PROJECTROOT
-#define PROJECTROOT	"/usr/X11R6"
+#define PROJECTROOT	"/usr"
 #endif
 
 static char *fontPath = NULL;
@@ -483,7 +486,8 @@
 #ifdef XFree86LOADER
     {
         const char *subdirs[] = {NULL, NULL};
-        static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
+        static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", 
+	                                "lib(.*)\\.so", NULL};
         char **dlist, **clist, **dcp, **ccp;
 	int size;
 

Index: xf86Config.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Config.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Config.h	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86Config.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _xf86_config_h
 #define _xf86_config_h
 

Index: xf86Configure.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Configure.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xf86Configure.c	24 May 2004 19:05:01 -0000	1.3
+++ xf86Configure.c	10 Jun 2004 19:40:04 -0000	1.4
@@ -1,4 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 1.1.4.1.6.4 2004/04/02 21:47:17 eich Exp $ */
 /*
  * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
  *
@@ -24,14 +25,17 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "os.h"
 #ifdef XFree86LOADER
 #include "loaderProcs.h"

Index: xf86Cursor.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Cursor.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Cursor.c	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86Cursor.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -28,9 +28,12 @@
 
 /* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "input.h"
 #include "cursor.h"
 #include "mipointer.h"
@@ -44,7 +47,7 @@
 #include "xf86_OSproc.h"
 
 #ifdef XINPUT
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "xf86Xinput.h"
 #endif
 

Index: xf86DGA.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86DGA.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86DGA.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86DGA.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -29,11 +29,14 @@
  * Written by Mark Vojkovich
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86str.h"
 #include "xf86Priv.h"
 #include "dgaproc.h"
-#include "xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
 #include "colormapst.h"
 #include "pixmapstr.h"
 #include "inputstr.h"
@@ -41,7 +44,7 @@
 #include "servermd.h"
 #include "micmap.h"
 #ifdef XKB
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #include "xf86Xinput.h"
 

Index: xf86DPMS.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86DPMS.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86DPMS.c	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86DPMS.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,14 +31,17 @@
  * This file contains the DPMS functions required by the extension.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "globals.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 #include "dpmsproc.h"
 #endif
 

Index: xf86Debug.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Debug.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Debug.c	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86Debug.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,13 +27,16 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif
 
 #include <sys/time.h>
 #include <unistd.h> 
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86DefModes.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86DefModes.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86DefModes.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86DefModes.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -9,6 +9,9 @@
  * Author: Dirk Hohndel <hohndel at XFree86.Org>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif

Index: xf86DoProbe.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86DoProbe.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86DoProbe.c	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86DoProbe.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,10 +31,13 @@
  * Load the driver modules and call their probe functions.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "os.h"
 #ifdef XFree86LOADER
 #include "loaderProcs.h"

Index: xf86DoScanPci.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86DoScanPci.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86DoScanPci.c	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86DoScanPci.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,10 +31,13 @@
  * Call the functions from the scanpci module.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "os.h"
 #ifdef XFree86LOADER
 #include "loaderProcs.h"

Index: xf86Events.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Events.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86Events.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86Events.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -53,13 +53,16 @@
 
 /* [JCH-96/01/21] Extended std reverse map to four buttons. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif
 
-#include "X.h"
-#include "Xpoll.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xpoll.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 
 #include "compiler.h"
@@ -76,8 +79,8 @@
 #endif
 
 #ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #else
 #include "inputstr.h"
 #endif
@@ -88,7 +91,7 @@
 
 #ifdef XF86BIGFONT
 #define _XF86BIGFONT_SERVER_
-#include "xf86bigfont.h"
+#include <X11/extensions/xf86bigfont.h>
 #endif
 
 #ifdef XKB

Index: xf86Globals.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Globals.c,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -u -d -r1.1.1.6 -r1.2
--- xf86Globals.c	26 Feb 2004 13:35:45 -0000	1.1.1.6
+++ xf86Globals.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,7 +31,10 @@
  * This file contains all the XFree86 global variables.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "windowstr.h"
 #include "propertyst.h"

Index: xf86Helper.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Helper.c,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- xf86Helper.c	29 Jan 2004 08:08:26 -0000	1.1.1.3
+++ xf86Helper.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -36,7 +36,10 @@
  * different drivers.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "servermd.h"
 #include "pixmapstr.h"
@@ -2627,7 +2630,7 @@
 
 /* Rather than duplicate loader's get OS function, just include it directly */
 #define LoaderGetOS xf86GetOS
-#include "loader/os.c"
+#include "../loader/os.c"
 
 /* new RAC */
 /*

Index: xf86InPriv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86InPriv.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86InPriv.h	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86InPriv.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _xf86InPriv_h
 #define _xf86InPriv_h
 

Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86Init.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86Init.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -32,6 +32,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 
 #undef HAS_UTSNAME
@@ -44,10 +47,10 @@
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
-#include "Xatom.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
 #include "input.h"
 #include "servermd.h"
 #include "windowstr.h"
@@ -71,11 +74,10 @@
 #include "xf86_OSlib.h"
 #include "xorgVersion.h"
 #include "xf86Date.h"
-#include "xf86Build.h"
 #include "mipointer.h"
 #ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #else
 #include "inputstr.h"
 #endif
@@ -113,7 +115,9 @@
 
 #ifdef XFree86LOADER
 static char *baseModules[] = {
+#if 0 /* XXX DS */
 	"bitmap",
+#endif
 	"pcidata",
 	NULL
 };
@@ -301,10 +305,6 @@
     else
       xf86ServerName = argv[0];
 
-#ifdef DO_CHECK_BETA
-    xf86CheckBeta(extraDays, expKey);
-#endif
-
     xf86PrintBanner();
     xf86PrintMarkers();
     if (xf86LogFile)  {
@@ -350,6 +350,7 @@
 	const char *patlist[] = {
 		"(.*)_drv\\.so",
 		"(.*)_drv\\.o",
+		"lib(.*)\\.so",
 		NULL
 	};
 	ErrorF("Getting module listing...\n");
@@ -393,6 +394,7 @@
     if (xf86DoConfigure)
 	DoConfigure();
 
+#if 0
     if (autoconfig) {
 	if (!xf86AutoConfig()) {
 	    xf86Msg(X_ERROR, "Auto configuration failed\n");
@@ -400,6 +402,7 @@
 	}
 	PostConfigInit();
     }
+#endif
 
     /* Initialise the resource broker */
     xf86ResourceBrokerInit();

Index: xf86Io.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Io.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Io.c	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86Io.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -50,9 +50,12 @@
 
 /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */
 
+#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 "inputstr.h"
 #include "scrnintstr.h"
 
@@ -66,7 +69,7 @@
 
 #ifdef XINPUT
 #include "xf86Xinput.h"
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #endif
 

Index: xf86Kbd.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Kbd.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Kbd.c	25 Nov 2003 19:28:32 -0000	1.1.1.2
+++ xf86Kbd.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -50,12 +50,15 @@
 
 /* $XConsortium: xf86Kbd.c /main/10 1996/02/21 17:38:32 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif
 
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "input.h"
 #include "scrnintstr.h"
 

Index: xf86KbdBSD.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86KbdBSD.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86KbdBSD.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86KbdBSD.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -51,8 +51,11 @@
 
 /* $XConsortium: xf86KbdBSD.c /main/6 1996/10/23 13:12:27 kaleb $ */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "input.h"
 #include "scrnintstr.h"
 

Index: xf86KbdLnx.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86KbdLnx.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86KbdLnx.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86KbdLnx.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -57,8 +57,11 @@
 
 /* $XConsortium: xf86KbdLnx.c /main/7 1996/10/19 17:59:00 kaleb $ */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "input.h"
 #include "scrnintstr.h"
 
@@ -70,7 +73,7 @@
 #include "atKeynames.h"
 
 #include "xf86Keymap.h"
-#include "DECkeysym.h"
+#include <X11/DECkeysym.h>
 
 /*
  * LegalModifier --

Index: xf86KbdMach.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86KbdMach.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86KbdMach.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86KbdMach.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -37,8 +37,11 @@
  */
 /* $XConsortium: xf86KbdMach.c /main/9 1996/02/21 17:38:43 kaleb $ */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "input.h"
 #include "scrnintstr.h"
 

Index: xf86Keymap.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Keymap.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Keymap.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86Keymap.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -36,6 +36,9 @@
 
 static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = {
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if !defined(__SOL8__) && (!defined(sun) || defined(i386))
 
     /* 0x00 */  NoSymbol,       NoSymbol,	NoSymbol,	NoSymbol,

Index: xf86MiscExt.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86MiscExt.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86MiscExt.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86MiscExt.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,11 +31,14 @@
  * XFree86-Misc extension.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif
 
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
@@ -50,15 +53,15 @@
 #include "xf86_OSlib.h"
 
 #ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "xf86Xinput.h"
 #else
 #include "inputstr.h"
 #endif
 
 #include "xf86OSmouse.h"
-#include "../input/mouse/mouse.h"
+/* XXX DS #include "../input/mouse/mouse.h" */
 
 #ifdef DEBUG
 # define DEBUG_P(x) ErrorF(x"\n");

Index: xf86Mode.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Mode.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86Mode.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86Mode.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -36,7 +36,10 @@
  * This file includes helper functions for mode related things.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "servermd.h"
 #include "mibank.h"

Index: xf86Module.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Module.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86Module.h	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86Module.h	10 Jun 2004 19:40:04 -0000	1.3
@@ -40,9 +40,13 @@
  * XXX This file arguably belongs in xfree86/loader/.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86MODULE_H
 #define _XF86MODULE_H
 
+#include "modularDefs.h"
 #include "misc.h"
 #include "xf86Version.h"
 #ifndef NULL

Index: xf86Opt.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Opt.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Opt.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86Opt.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -29,6 +29,9 @@
 
 /* Option handling things that ModuleSetup procs can use */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_OPT_H_
 #define _XF86_OPT_H_
 

Index: xf86Option.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Option.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Option.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86Option.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -32,9 +32,12 @@
  * This file includes public option handling functions.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <ctype.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Xinput.h"

Index: xf86PM.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86PM.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86PM.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86PM.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -26,7 +26,10 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Xinput.h"

Index: xf86PciInfo.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86PciInfo.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86PciInfo.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86PciInfo.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -47,6 +47,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_PCIINFO_H
 #define _XF86_PCIINFO_H
 

Index: xf86Priv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Priv.h,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- xf86Priv.h	29 Jan 2004 08:08:26 -0000	1.1.1.3
+++ xf86Priv.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -34,6 +34,9 @@
  * "private" means not available to video drivers.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86PRIV_H
 #define _XF86PRIV_H
 

Index: xf86Privstr.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Privstr.h,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -u -d -r1.1.1.3 -r1.2
--- xf86Privstr.h	29 Jan 2004 08:08:26 -0000	1.1.1.3
+++ xf86Privstr.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -32,6 +32,9 @@
  * None of the data structures here should be used by video drivers.
  */ 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86PRIVSTR_H
 #define _XF86PRIVSTR_H
 

Index: xf86RandR.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86RandR.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86RandR.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86RandR.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -23,7 +23,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "mibank.h"
 #include "globals.h"

Index: xf86Resources.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Resources.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Resources.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86Resources.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_RESOURCES_H
 
 #define _XF86_RESOURCES_H

Index: xf86Versions.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Versions.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- xf86Versions.c	25 Nov 2003 19:28:33 -0000	1.1.1.1
+++ xf86Versions.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86OSmouse.h"
 #include "xf86OSKbd.h"

Index: xf86VidMode.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86VidMode.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86VidMode.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86VidMode.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -35,7 +35,10 @@
  * maintained.
  */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86XKB.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86XKB.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86XKB.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86XKB.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -53,6 +53,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.12 2003/08/24 17:36:55 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #define	NEED_EVENTS 1
 #include <X11/X.h>
@@ -61,7 +64,7 @@
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XI.h"
+#include <X11/extensions/XI.h>
 
 #include "compiler.h"
 
@@ -70,7 +73,7 @@
 #define XF86_OS_PRIVS
 #include "xf86_OSlib.h"
 
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
 void
 xf86InitXkb(void)

Index: xf86Xinput.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Xinput.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Xinput.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86Xinput.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -49,11 +49,14 @@
  */
 /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */
 
-#include "Xfuncproto.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
 #ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #endif
 #include "xf86.h"
 #include "xf86Priv.h"
@@ -66,7 +69,7 @@
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 #include "dpmsproc.h"
 #endif
 
@@ -86,7 +89,7 @@
 #include <stdarg.h>
 
 #include "osdep.h"		/* EnabledDevices */
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include "xf86_OSproc.h"	/* sigio stuff */
 
 /******************************************************************************

Index: xf86Xinput.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Xinput.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86Xinput.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86Xinput.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -51,6 +51,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h,v 3.36 2003/08/24 17:36:55 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _xf86Xinput_h
 #define _xf86Xinput_h
 
@@ -60,8 +63,8 @@
 #include "xf86str.h"
 #include "inputstr.h"
 #ifdef XINPUT
-#include "extensions/XI.h"
-#include "extensions/XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #endif
 

Index: xf86cmap.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86cmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86cmap.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86cmap.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.1.4.2 2004/02/16 20:19:59 alanc Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */
 /*
  * Copyright (c) 1998-2001 by The XFree86 Project, Inc.
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
 	|| (defined(sun) && defined(__SVR4))
 #include <math.h>
@@ -36,9 +39,9 @@
 #undef _XOPEN_SOURCE
 #endif
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "colormapst.h"
 #include "scrnintstr.h"
 
@@ -51,7 +54,7 @@
 
 #ifdef XFreeXDGA
 #define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
 #include "dgaproc.h"
 #endif
 
@@ -440,7 +443,7 @@
 	((1 << pmap->pVisual->nplanes) > pScreenPriv->maxColors))
 		return;
 
-    if(LOAD_PALETTE(pmap, index))
+    if(pmap && LOAD_PALETTE(pmap, index))
 	CMapReinstallMap(pmap);
 }
 

Index: xf86cmap.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86cmap.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86cmap.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86cmap.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86CMAP_H
 #define _XF86CMAP_H
 

Index: xf86fbBus.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86fbBus.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86fbBus.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86fbBus.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,10 +31,13 @@
  * This file contains the interfaces to the bus-specific code
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86fbman.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86fbman.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86fbman.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86fbman.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,10 +27,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "regionstr.h"
 #include "xf86fbman.h"

Index: xf86fbman.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86fbman.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86fbman.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86fbman.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86FBMAN_H
 #define _XF86FBMAN_H
 

Index: xf86isaBus.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86isaBus.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86isaBus.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86isaBus.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,10 +31,13 @@
  * This file contains the interfaces to the bus-specific code
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86noBus.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86noBus.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86noBus.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86noBus.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -31,10 +31,13 @@
  * This file contains the interfaces to the bus-specific code
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86pciBus.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86pciBus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86pciBus.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86pciBus.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -29,12 +29,15 @@
 /*
  * This file contains the interfaces to the bus-specific code
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define INCLUDE_DEPRECATED 1
 
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "Pci.h"
 #include "xf86.h"

Index: xf86pciBus.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86pciBus.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86pciBus.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86pciBus.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_PCI_BUS_H
 #define _XF86_PCI_BUS_H
 

Index: xf86sbusBus.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86sbusBus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86sbusBus.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86sbusBus.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -22,10 +22,13 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86sbusBus.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86sbusBus.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86sbusBus.h	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86sbusBus.h	10 Jun 2004 19:40:04 -0000	1.3
@@ -22,6 +22,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86_SBUSBUS_H
 #define _XF86_SBUSBUS_H
 

Index: xf86str.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86str.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86str.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86str.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -32,6 +32,9 @@
  * Any data structures that video drivers need to access should go here.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86STR_H
 #define _XF86STR_H
 

Index: xf86xv.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86xv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xf86xv.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xf86xv.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -30,12 +30,15 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "regionstr.h"
 #include "windowstr.h"
@@ -46,8 +49,8 @@
 #include "gcstruct.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #ifdef XFree86LOADER
 #include "xvmodproc.h"

Index: xf86xv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86xv.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86xv.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86xv.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86XV_H_
 #define _XF86XV_H_
 

Index: xf86xvmc.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86xvmc.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86xvmc.c	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86xvmc.c	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,12 +27,15 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "resource.h"
 #include "dixstruct.h"

Index: xf86xvmc.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86xvmc.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- xf86xvmc.h	25 Nov 2003 19:28:33 -0000	1.1.1.2
+++ xf86xvmc.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86XVMC_H
 #define _XF86XVMC_H
 

Index: xf86xvpriv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86xvpriv.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- xf86xvpriv.h	25 Nov 2003 19:28:33 -0000	1.1.1.1
+++ xf86xvpriv.h	10 Jun 2004 19:40:04 -0000	1.2
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XF86XVPRIV_H_
 #define _XF86XVPRIV_H_
 

Index: xisb.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xisb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xisb.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xisb.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -36,6 +36,9 @@
  *	Standard Headers
  ****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif

Index: xisb.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xisb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xisb.h	23 Apr 2004 19:20:32 -0000	1.2
+++ xisb.h	10 Jun 2004 19:40:04 -0000	1.3
@@ -26,6 +26,9 @@
  */
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef	_xisb_H_
 #define _xisb_H_
 

Index: xorgHelper.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/common/xorgHelper.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xorgHelper.c	23 Apr 2004 19:20:32 -0000	1.2
+++ xorgHelper.c	10 Jun 2004 19:40:04 -0000	1.3
@@ -1,6 +1,9 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.1.6.1 2004/04/02 21:47:17 eich Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "os.h"
 #include "servermd.h"
 #include "pixmapstr.h"

More information about the xserver-commit mailing list