Prep for modular builds by adding guarded #include "config.h" everywhere.XORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_16XORG-6_8_99_15accelerated_indirect-0-0-1

13 files changed, 62 insertions, 10 deletions

diff --git a/src/CirrusClk.c b/src/CirrusClk.c
index c548f1f..6a8e57e 100644
--- a/src/CirrusClk.c
+++ b/src/CirrusClk.c
@@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.9 1999/12/26 18:24:14 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.8 1998/12/06 06:08:28 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*
  * Programming of the built-in Cirrus clock generator.
diff --git a/src/alp_driver.c b/src/alp_driver.c
index 07f1931..95c5420 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -11,6 +11,10 @@
  *    Guy DESBIEF
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.35 2003/11/03 05:11:09 tsi Exp $ */
 
 /* All drivers should typically include these */
diff --git a/src/alp_hwcurs.c b/src/alp_hwcurs.c
index a4f0581..927a73e 100644
--- a/src/alp_hwcurs.c
+++ b/src/alp_hwcurs.c
@@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.5 2001/05/07 21:59:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.4 2000/12/06 15:35:15 eich Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* (c) Itai Nahshon */
 
diff --git a/src/alp_i2c.c b/src/alp_i2c.c
index 78d5406..86f4788 100644
--- a/src/alp_i2c.c
+++ b/src/alp_i2c.c
@@ -1,6 +1,10 @@
 /* (c) Itai Nahshon */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.3 2000/12/06 15:35:15 eich Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.6 1999/02/28 11:19:38 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/alp_xaa.c b/src/alp_xaa.c
index 417f816..3bcafd7 100644
--- a/src/alp_xaa.c
+++ b/src/alp_xaa.c
@@ -1,6 +1,10 @@
 /* (c) Itai Nahshon */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.8 2002/01/25 21:56:00 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/alp_xaam.c b/src/alp_xaam.c
index 2f25092..16d86be 100644
--- a/src/alp_xaam.c
+++ b/src/alp_xaam.c
@@ -1,6 +1,10 @@
 /* (c) Itai Nahshon */
 /* #define DEBUG */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.8 2002/07/10 02:36:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/cir_dga.c b/src/cir_dga.c
index 7677160..de95ccc 100644
--- a/src/cir_dga.c
+++ b/src/cir_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.5 2001/02/15 17:39:27 eich Exp $ */
 /*
  * Copyright 2000 by Egbert Eich
  *
@@ -24,6 +24,10 @@
  *           by: Egbert Eich
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 1f02e50..9a7b233 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -11,6 +11,10 @@
  *	Guy DESBIEF
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */
 
 /* All drivers should typically include these */
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index 184dee8..6c4c2bc 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -1,10 +1,14 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_shadow.c,v 1.1 2000/02/08 13:13:14 eich Exp $ */
+/* $XFree86: Exp $ */
 
 /*
    Copyright (c) 1999,2000  The XFree86 Project Inc. 
    based on code written by Mark Vojkovich <markv@valinux.com>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
diff --git a/src/lg_driver.c b/src/lg_driver.c
index f0dcba2..c735fb2 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -15,6 +15,10 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.49 2003/11/03 05:11:09 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define EXPERIMENTAL
 
 /* All drivers should typically include these */
diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c
index 7e30bdb..cf4c15d 100644
--- a/src/lg_hwcurs.c
+++ b/src/lg_hwcurs.c
@@ -10,7 +10,11 @@
  * Much of this code is inspired by the HW cursor code from XFree86
  * 3.3.3.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.5 2001/05/07 21:59:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/lg_i2c.c b/src/lg_i2c.c
index 6cb3e3d..965343b 100644
--- a/src/lg_i2c.c
+++ b/src/lg_i2c.c
@@ -1,6 +1,10 @@
 /* (c) Itai Nahshon */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.1 1998/11/15 04:30:25 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/lg_xaa.c b/src/lg_xaa.c
index 9488721..c42652f 100644
--- a/src/lg_xaa.c
+++ b/src/lg_xaa.c
@@ -10,7 +10,11 @@
  * Much of this code is inspired by the XAA acceleration from XFree86
  * 3.3.3, laguna_acl.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.5 2001/02/15 17:39:28 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"