Prep for modular builds by adding guarded #include "config.h" everywhere.XORG-6_8_99_16XORG-6_8_99_15

19 files changed, 79 insertions, 3 deletions

diff --git a/src/i810_accel.c b/src/i810_accel.c
index 2b0b594a..f946ae2a 100644
--- a/src/i810_accel.c
+++ b/src/i810_accel.c
@@ -27,6 +27,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_accel.c,v 1.21 2004/01/02 20:22:17 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*
  * Reformatted with GNU indent (2.2.8), using the following options:
  *
diff --git a/src/i810_cursor.c b/src/i810_cursor.c
index 23b006d3..85c4e254 100644
--- a/src/i810_cursor.c
+++ b/src/i810_cursor.c
@@ -27,6 +27,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_cursor.c,v 1.6 2002/09/11 00:29:31 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*
  * Reformatted with GNU indent (2.2.8), using the following options:
  *
diff --git a/src/i810_dga.c b/src/i810_dga.c
index 0abac2bf..e6713331 100644
--- a/src/i810_dga.c
+++ b/src/i810_dga.c
@@ -34,7 +34,11 @@
  * with <TAB> characters expanded at 8-column intervals.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c,v 1.6 2003/02/26 04:19:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dga.c,v 1.5 2002/09/11 00:29:31 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/i810_dri.c b/src/i810_dri.c
index 8cd4d1ea..9aaab8cd 100644
--- a/src/i810_dri.c
+++ b/src/i810_dri.c
@@ -12,6 +12,10 @@
  * with <TAB> characters expanded at 8-column intervals.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 4566f8db..2bd360bb 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -27,6 +27,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.101 2004/01/02 20:15:47 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*
  * Reformatted with GNU indent (2.2.8), using the following options:
  *
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c
index 5b9908cd..5d253236 100644
--- a/src/i810_hwmc.c
+++ b/src/i810_hwmc.c
@@ -34,6 +34,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_hwmc.c,v 1.3 2001/12/04 21:17:56 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/i810_io.c b/src/i810_io.c
index de947dde..8d097f21 100644
--- a/src/i810_io.c
+++ b/src/i810_io.c
@@ -24,7 +24,11 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c,v 1.5 2002/09/11 00:29:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_io.c,v 1.4 2002/01/25 21:56:04 tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*
  * Reformatted with GNU indent (2.2.8), using the following options:
diff --git a/src/i810_memory.c b/src/i810_memory.c
index 75ec2442..816e5d80 100644
--- a/src/i810_memory.c
+++ b/src/i810_memory.c
@@ -26,6 +26,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*
  * Reformatted with GNU indent (2.2.8), using the following options:
  *
diff --git a/src/i810_video.c b/src/i810_video.c
index 94487e73..f420d2f2 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -34,6 +34,10 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *        Matt Sottek <matthew.j.sottek@intel.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
diff --git a/src/i810_wmark.c b/src/i810_wmark.c
index 9a6bdd34..6540cbba 100644
--- a/src/i810_wmark.c
+++ b/src/i810_wmark.c
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_wmark.c,v 1.8 2002/10/30 12:52:18 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_wmark.c,v 1.7 2002/09/11 00:29:32 dawes Exp $ */
 
 /*
  * Reformatted with GNU indent (2.2.8), using the following options:
@@ -45,6 +45,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Keith Whitwell <keith@tungstengraphics.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "i810.h"
 
diff --git a/src/i830_accel.c b/src/i830_accel.c
index d6c2d384..7211f4bd 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -2,6 +2,11 @@
  * XXX So far, for GXxor this is about 40% of the speed of SW, but CPU
  * utilisation falls from 95% to < 5%.
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef DO_SCANLINE_IMAGE_WRITE
 #define DO_SCANLINE_IMAGE_WRITE 0
 #endif
diff --git a/src/i830_cursor.c b/src/i830_cursor.c
index 0603f40a..24114192 100644
--- a/src/i830_cursor.c
+++ b/src/i830_cursor.c
@@ -54,6 +54,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/i830_dga.c b/src/i830_dga.c
index b1416598..e1991db4 100644
--- a/src/i830_dga.c
+++ b/src/i830_dga.c
@@ -36,6 +36,10 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dga.c,v 1.2 2002/11/05 02:01:18 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 51a82ca8..db6da3af 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -58,6 +58,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  * DHD 07/2002
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 6f876748..897e8a8b 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -148,6 +148,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  *        - Add Intel(R) 945G support.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef PRINT_MODE_INFO
 #define PRINT_MODE_INFO 0
 #endif
diff --git a/src/i830_memory.c b/src/i830_memory.c
index e8f04258..fd95d0fc 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -50,6 +50,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Alan Hourihane <alanh@tungstengraphics.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/src/i830_modes.c b/src/i830_modes.c
index 587c2543..457b583e 100644
--- a/src/i830_modes.c
+++ b/src/i830_modes.c
@@ -34,6 +34,10 @@
  * to support extended BIOS modes for the Intel chipsets
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "vbe.h"
diff --git a/src/i830_shadow.c b/src/i830_shadow.c
index d12604a0..93c72c59 100644
--- a/src/i830_shadow.c
+++ b/src/i830_shadow.c
@@ -10,6 +10,10 @@
  * Helmar Spangenberg <hspangenberg@frey.de> and Dima Dorfman
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "i830.h"
 #include "shadowfb.h"
diff --git a/src/i830_video.c b/src/i830_video.c
index 834dd560..12c25e05 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -60,6 +60,10 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * XXX Could support more formats.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"