[xserver-commit] xfree86/common Makefile.am,3.1,3.2 miinitext.c,3.1,3.2 xf86.h,3.174,3.175 xf86AutoConfig.c,1.4,1.5 xf86Beta.c,3.11,3.12 xf86Bus.c,1.80,1.81 xf86Config.c,3.278,3.279 xf86Configure.c,3.82,3.83 xf86Cursor.c,3.38,3.39 xf86DGA.c,1.48,1.49 xf86DPMS.c,1.12,1.13 xf86Debug.c,1.8,1.9 xf86DefModes.c,1.11,1.12 xf86DoProbe.c,1.15,1.16 xf86DoScanPci.c,1.16,1.17 xf86Events.c,3.160,3.161 xf86Globals.c,1.43,1.44 xf86Helper.c,1.137,1.138 xf86Init.c,3.213,3.214 xf86Io.c,3.57,3.58 xf86Kbd.c,3.27,3.28 xf86KbdBSD.c,3.23,3.24 xf86KbdLnx.c,3.18,3.19 xf86KbdMach.c,3.9,3.10 xf86MiscExt.c,1.17,1.18 xf86Mode.c,1.70,1.71 xf86Option.c,1.30,1.31 xf86PM.c,3.10,3.11 xf86RandR.c,1.9,1.10 xf86Versions.c,1.3,1.4 xf86VidMode.c,1.18,1.19 xf86XKB.c,3.13,3.14 xf86Xinput.c,3.71,3.72 xf86cmap.c,1.26,1.27 xf86fbBus.c,1.4,1.5 xf86fbman.c,1.29,1.30 xf86fbman.h,1.15,1.16 xf86isaBus.c,3.7,3.8 xf86noBus.c,1.3,1.4 xf86pciBus.c,3.78,3.79 xf86sbusBus.c,3.8,3.9 xf86xv.c,1.38,1.39 xf86xvmc.c,1.7,1.8 xisb.c,1.7,1.8

Keith Packard xserver-commit@pdx.freedesktop.org


Committed by: keithp

Update of /cvs/xserver/xfree86/common
In directory pdx:/tmp/cvs-serv14744/common

Modified Files:
	Makefile.am miinitext.c xf86.h xf86AutoConfig.c xf86Beta.c 
	xf86Bus.c xf86Config.c xf86Configure.c xf86Cursor.c xf86DGA.c 
	xf86DPMS.c xf86Debug.c xf86DefModes.c xf86DoProbe.c 
	xf86DoScanPci.c xf86Events.c xf86Globals.c xf86Helper.c 
	xf86Init.c xf86Io.c xf86Kbd.c xf86KbdBSD.c xf86KbdLnx.c 
	xf86KbdMach.c xf86MiscExt.c xf86Mode.c xf86Option.c xf86PM.c 
	xf86RandR.c xf86Versions.c xf86VidMode.c xf86XKB.c 
	xf86Xinput.c xf86cmap.c xf86fbBus.c xf86fbman.c xf86fbman.h 
	xf86isaBus.c xf86noBus.c xf86pciBus.c xf86sbusBus.c xf86xv.c 
	xf86xvmc.c xisb.c 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/common/Makefile.am,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- a/Makefile.am	19 Feb 2004 03:50:05 -0000	3.1
+++ b/Makefile.am	28 Feb 2004 01:27:38 -0000	3.2
@@ -48,7 +48,7 @@
                           xf86fbman.c xf86cmap.c xf86PM.c xf86Versions.c \
                           $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \
                           $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \
-                          $(KBDSOURCES) miinitext.c
+                          $(KBDSOURCES)
 
 AM_CFLAGS = $(XF86_CFLAGS)
 

Index: miinitext.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/miinitext.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- a/miinitext.c	19 Feb 2004 03:50:05 -0000	3.1
+++ b/miinitext.c	28 Feb 2004 01:27:38 -0000	3.2
@@ -1,8 +1,9 @@
 /* This is the worst hack I've yet perpetuated. I'd like to apologise.
  * Daniel Stone <daniel@freedesktop.org>, Feb 16th, 2004. */
 
-#define NO_XFIXES
-#define NO_DAMAGEEXT
-#define NO_COMPOSITE
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#undef COMPOSITE
 /* FIXME THIS FILE SHOULDN'T EXIST, BUT THIS IS SRCDIR != BUILDDIR UNSAFE. */
 #include "../../../mi/miinitext.c"

Index: xf86.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86.h,v
retrieving revision 3.174
retrieving revision 3.175
diff -u -d -r3.174 -r3.175
--- a/xf86.h	19 Feb 2004 03:51:36 -0000	3.174
+++ b/xf86.h	28 Feb 2004 01:27:38 -0000	3.175
@@ -42,6 +42,8 @@
 #include <X11/Xfuncproto.h>
 #ifndef IN_MODULE
 #include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
 #else
 #include "xf86_ansic.h"
 #endif

Index: xf86AutoConfig.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86AutoConfig.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/xf86AutoConfig.c	19 Feb 2004 03:51:36 -0000	1.4
+++ b/xf86AutoConfig.c	28 Feb 2004 01:27:38 -0000	1.5
@@ -49,6 +49,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.3 2003/12/12 00:39:16 dawes 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/xfree86/common/xf86Beta.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- a/xf86Beta.c	19 Feb 2004 03:51:36 -0000	3.11
+++ b/xf86Beta.c	28 Feb 2004 01:27:38 -0000	3.12
@@ -48,6 +48,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/xfree86/common/xf86Bus.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- a/xf86Bus.c	19 Feb 2004 03:51:36 -0000	1.80
+++ b/xf86Bus.c	28 Feb 2004 01:27:38 -0000	1.81
@@ -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

Index: xf86Config.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Config.c,v
retrieving revision 3.278
retrieving revision 3.279
diff -u -d -r3.278 -r3.279
--- a/xf86Config.c	19 Feb 2004 03:51:36 -0000	3.278
+++ b/xf86Config.c	28 Feb 2004 01:27:38 -0000	3.279
@@ -45,6 +45,9 @@
  *      ... and others
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XF86DRI
 #include <sys/types.h>
 #include <grp.h>
@@ -803,7 +806,9 @@
     int i;
     Pix24Flags pix24 = Pix24DontCare;
     Bool value;
+#ifdef PANORAMIX
     MessageType from;
+#endif
 
     /*
      * Merge the ServerLayout and ServerFlags options.  The former have

Index: xf86Configure.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Configure.c,v
retrieving revision 3.82
retrieving revision 3.83
diff -u -d -r3.82 -r3.83
--- a/xf86Configure.c	19 Feb 2004 03:51:36 -0000	3.82
+++ b/xf86Configure.c	28 Feb 2004 01:27:38 -0000	3.83
@@ -24,9 +24,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

Index: xf86Cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Cursor.c,v
retrieving revision 3.38
retrieving revision 3.39
diff -u -d -r3.38 -r3.39
--- a/xf86Cursor.c	19 Feb 2004 03:51:36 -0000	3.38
+++ b/xf86Cursor.c	28 Feb 2004 01:27:38 -0000	3.39
@@ -28,6 +28,9 @@
 
 /* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xmd.h>

Index: xf86DGA.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DGA.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- a/xf86DGA.c	19 Feb 2004 03:51:36 -0000	1.48
+++ b/xf86DGA.c	28 Feb 2004 01:27:38 -0000	1.49
@@ -28,6 +28,9 @@
  * Written by Mark Vojkovich
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86str.h"
 #include "xf86Priv.h"

Index: xf86DPMS.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DPMS.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/xf86DPMS.c	19 Feb 2004 03:51:36 -0000	1.12
+++ b/xf86DPMS.c	28 Feb 2004 01:27:38 -0000	1.13
@@ -31,6 +31,9 @@
  * This file contains the DPMS functions required by the extension.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "globals.h"

Index: xf86Debug.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Debug.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/xf86Debug.c	19 Feb 2004 03:51:36 -0000	1.8
+++ b/xf86Debug.c	28 Feb 2004 01:27:38 -0000	1.9
@@ -27,6 +27,9 @@
  * 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

Index: xf86DefModes.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DefModes.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/xf86DefModes.c	19 Feb 2004 03:51:36 -0000	1.11
+++ b/xf86DefModes.c	28 Feb 2004 01:27:38 -0000	1.12
@@ -9,6 +9,9 @@
  * Author: Dirk Hohndel <hohndel@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/xfree86/common/xf86DoProbe.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xf86DoProbe.c	19 Feb 2004 03:51:36 -0000	1.15
+++ b/xf86DoProbe.c	28 Feb 2004 01:27:38 -0000	1.16
@@ -31,6 +31,9 @@
  * Load the driver modules and call their probe functions.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <X11/X.h>

Index: xf86DoScanPci.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DoScanPci.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/xf86DoScanPci.c	19 Feb 2004 03:51:36 -0000	1.16
+++ b/xf86DoScanPci.c	28 Feb 2004 01:27:38 -0000	1.17
@@ -31,6 +31,9 @@
  * Call the functions from the scanpci module.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <X11/X.h>

Index: xf86Events.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Events.c,v
retrieving revision 3.160
retrieving revision 3.161
diff -u -d -r3.160 -r3.161
--- a/xf86Events.c	19 Feb 2004 03:51:36 -0000	3.160
+++ b/xf86Events.c	28 Feb 2004 01:27:38 -0000	3.161
@@ -52,6 +52,9 @@
 
 /* [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

Index: xf86Globals.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Globals.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- a/xf86Globals.c	19 Feb 2004 03:51:36 -0000	1.43
+++ b/xf86Globals.c	28 Feb 2004 01:27:38 -0000	1.44
@@ -31,6 +31,9 @@
  * This file contains all the XFree86 global variables.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "windowstr.h"

Index: xf86Helper.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Helper.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- a/xf86Helper.c	19 Feb 2004 03:51:36 -0000	1.137
+++ b/xf86Helper.c	28 Feb 2004 01:27:38 -0000	1.138
@@ -36,6 +36,9 @@
  * different drivers.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "servermd.h"

Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Init.c,v
retrieving revision 3.213
retrieving revision 3.214
diff -u -d -r3.213 -r3.214
--- a/xf86Init.c	19 Feb 2004 03:51:36 -0000	3.213
+++ b/xf86Init.c	28 Feb 2004 01:27:38 -0000	3.214
@@ -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

Index: xf86Io.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Io.c,v
retrieving revision 3.57
retrieving revision 3.58
diff -u -d -r3.57 -r3.58
--- a/xf86Io.c	19 Feb 2004 03:51:36 -0000	3.57
+++ b/xf86Io.c	28 Feb 2004 01:27:38 -0000	3.58
@@ -50,6 +50,9 @@
 
 /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>

Index: xf86Kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Kbd.c,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -d -r3.27 -r3.28
--- a/xf86Kbd.c	19 Feb 2004 03:51:36 -0000	3.27
+++ b/xf86Kbd.c	28 Feb 2004 01:27:38 -0000	3.28
@@ -50,6 +50,9 @@
 
 /* $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

Index: xf86KbdBSD.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86KbdBSD.c,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -d -r3.23 -r3.24
--- a/xf86KbdBSD.c	19 Feb 2004 03:51:36 -0000	3.23
+++ b/xf86KbdBSD.c	28 Feb 2004 01:27:38 -0000	3.24
@@ -51,6 +51,9 @@
 
 /* $XConsortium: xf86KbdBSD.c /main/6 1996/10/23 13:12:27 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "input.h"

Index: xf86KbdLnx.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86KbdLnx.c,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -d -r3.18 -r3.19
--- a/xf86KbdLnx.c	19 Feb 2004 03:51:36 -0000	3.18
+++ b/xf86KbdLnx.c	28 Feb 2004 01:27:38 -0000	3.19
@@ -57,6 +57,9 @@
 
 /* $XConsortium: xf86KbdLnx.c /main/7 1996/10/19 17:59:00 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "input.h"

Index: xf86KbdMach.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86KbdMach.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- a/xf86KbdMach.c	19 Feb 2004 03:51:36 -0000	3.9
+++ b/xf86KbdMach.c	28 Feb 2004 01:27:38 -0000	3.10
@@ -37,6 +37,9 @@
  */
 /* $XConsortium: xf86KbdMach.c /main/9 1996/02/21 17:38:43 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "input.h"

Index: xf86MiscExt.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86MiscExt.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/xf86MiscExt.c	19 Feb 2004 03:51:36 -0000	1.17
+++ b/xf86MiscExt.c	28 Feb 2004 01:27:38 -0000	1.18
@@ -31,6 +31,9 @@
  * XFree86-Misc extension.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif

Index: xf86Mode.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Mode.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- a/xf86Mode.c	19 Feb 2004 03:51:36 -0000	1.70
+++ b/xf86Mode.c	28 Feb 2004 01:27:38 -0000	1.71
@@ -35,6 +35,9 @@
  * This file includes helper functions for mode related things.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "servermd.h"

Index: xf86Option.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Option.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- a/xf86Option.c	19 Feb 2004 03:51:36 -0000	1.30
+++ b/xf86Option.c	28 Feb 2004 01:27:38 -0000	1.31
@@ -32,6 +32,9 @@
  * This file includes public option handling functions.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <ctype.h>
 #include <X11/X.h>

Index: xf86PM.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86PM.c,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/xf86PM.c	19 Feb 2004 03:51:36 -0000	3.10
+++ b/xf86PM.c	28 Feb 2004 01:27:38 -0000	3.11
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Priv.h"

Index: xf86RandR.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86RandR.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/xf86RandR.c	19 Feb 2004 03:51:36 -0000	1.9
+++ b/xf86RandR.c	28 Feb 2004 01:27:38 -0000	1.10
@@ -22,6 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "mibank.h"

Index: xf86Versions.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Versions.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xf86Versions.c	19 Feb 2004 03:51:36 -0000	1.3
+++ b/xf86Versions.c	28 Feb 2004 01:27:38 -0000	1.4
@@ -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/xfree86/common/xf86VidMode.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/xf86VidMode.c	19 Feb 2004 03:51:36 -0000	1.18
+++ b/xf86VidMode.c	28 Feb 2004 01:27:38 -0000	1.19
@@ -35,6 +35,9 @@
  * maintained.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/X.h>
 #include "os.h"
 #include "xf86.h"

Index: xf86XKB.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86XKB.c,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -d -r3.13 -r3.14
--- a/xf86XKB.c	19 Feb 2004 03:51:36 -0000	3.13
+++ b/xf86XKB.c	28 Feb 2004 01:27:38 -0000	3.14
@@ -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>

Index: xf86Xinput.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Xinput.c,v
retrieving revision 3.71
retrieving revision 3.72
diff -u -d -r3.71 -r3.72
--- a/xf86Xinput.c	19 Feb 2004 03:51:36 -0000	3.71
+++ b/xf86Xinput.c	28 Feb 2004 01:27:38 -0000	3.72
@@ -49,6 +49,9 @@
  */
 /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>
 #include <X11/extensions/XI.h>

Index: xf86cmap.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86cmap.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- a/xf86cmap.c	19 Feb 2004 03:51:36 -0000	1.26
+++ b/xf86cmap.c	28 Feb 2004 01:27:38 -0000	1.27
@@ -26,6 +26,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__)
 #include <math.h>
 #else

Index: xf86fbBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86fbBus.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/xf86fbBus.c	19 Feb 2004 03:51:36 -0000	1.4
+++ b/xf86fbBus.c	28 Feb 2004 01:27:38 -0000	1.5
@@ -31,6 +31,9 @@
  * 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>

Index: xf86fbman.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86fbman.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- a/xf86fbman.c	19 Feb 2004 03:51:36 -0000	1.29
+++ b/xf86fbman.c	28 Feb 2004 01:27:38 -0000	1.30
@@ -27,6 +27,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "xf86.h"
 

Index: xf86fbman.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86fbman.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xf86fbman.h	19 Feb 2004 03:51:36 -0000	1.15
+++ b/xf86fbman.h	28 Feb 2004 01:27:38 -0000	1.16
@@ -34,6 +34,10 @@
 #include "scrnintstr.h"
 #include "regionstr.h"
 
+#ifndef REGION_NULL
+#define REGION_NULL(_pScreen, _pReg) \
+    REGION_INIT(_pScreen, _pReg, NullBox, 1)
+#endif
 
 #define FAVOR_AREA_THEN_WIDTH		0
 #define FAVOR_AREA_THEN_HEIGHT		1

Index: xf86isaBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86isaBus.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- a/xf86isaBus.c	19 Feb 2004 03:51:36 -0000	3.7
+++ b/xf86isaBus.c	28 Feb 2004 01:27:38 -0000	3.8
@@ -31,6 +31,9 @@
  * 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>

Index: xf86noBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86noBus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xf86noBus.c	19 Feb 2004 03:51:36 -0000	1.3
+++ b/xf86noBus.c	28 Feb 2004 01:27:38 -0000	1.4
@@ -31,6 +31,9 @@
  * 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>

Index: xf86pciBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86pciBus.c,v
retrieving revision 3.78
retrieving revision 3.79
diff -u -d -r3.78 -r3.79
--- a/xf86pciBus.c	19 Feb 2004 03:51:36 -0000	3.78
+++ b/xf86pciBus.c	28 Feb 2004 01:27:38 -0000	3.79
@@ -29,6 +29,9 @@
 /*
  * 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>

Index: xf86sbusBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86sbusBus.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- a/xf86sbusBus.c	19 Feb 2004 03:51:36 -0000	3.8
+++ b/xf86sbusBus.c	28 Feb 2004 01:27:38 -0000	3.9
@@ -22,6 +22,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>

Index: xf86xv.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86xv.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- a/xf86xv.c	19 Feb 2004 03:51:36 -0000	1.38
+++ b/xf86xv.c	28 Feb 2004 01:27:38 -0000	1.39
@@ -30,6 +30,9 @@
 
 /* $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"
@@ -53,6 +56,10 @@
 
 #include "xf86xvpriv.h"
 
+#ifndef REGION_NULL
+#define REGION_NULL(_pScreen, _pReg) \
+    REGION_INIT(_pScreen, _pReg, NullBox, 1)
+#endif
 
 /* XvScreenRec fields */
 

Index: xf86xvmc.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86xvmc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/xf86xvmc.c	19 Feb 2004 03:51:36 -0000	1.7
+++ b/xf86xvmc.c	28 Feb 2004 01:27:38 -0000	1.8
@@ -27,6 +27,9 @@
  * 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"

Index: xisb.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xisb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/xisb.c	19 Feb 2004 03:51:36 -0000	1.7
+++ b/xisb.c	28 Feb 2004 01:27:38 -0000	1.8
@@ -36,6 +36,9 @@
  *	Standard Headers
  ****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
 #endif