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

9 files changed, 42 insertions, 6 deletions

diff --git a/src/tdfx_accel.c b/src/tdfx_accel.c
index d7c11b7..8d55cba 100644
--- a/src/tdfx_accel.c
+++ b/src/tdfx_accel.c
@@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c,v 1.20 2001/10/28 03:33:49 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c,v 1.19 2001/04/05 21:29:17 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /* All drivers should typically include these */
 #include "xf86.h"
diff --git a/src/tdfx_dga.c b/src/tdfx_dga.c
index f0a97a3..67987a0 100644
--- a/src/tdfx_dga.c
+++ b/src/tdfx_dga.c
@@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c,v 1.6 2001/03/21 17:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dga.c,v 1.5 2001/01/13 00:06:29 mvojkovi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c
index 45d91bb..3f3a69b 100644
--- a/src/tdfx_dri.c
+++ b/src/tdfx_dri.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c,v 1.25 2003/02/08 21:26:59 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
@@ -8,6 +12,7 @@
 #include "xf86Pci.h"
 #include "fb.h"
 #include "miline.h"
+#include "GL/glxint.h"
 #include "GL/glxtokens.h"
 #include "tdfx.h"
 #include "tdfx_dri.h"
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index f0587fa..4f96933 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define USE_INT10 1
 #define USE_PCIVGAIO 1
 
diff --git a/src/tdfx_hwcurs.c b/src/tdfx_hwcurs.c
index 637ece4..91184f9 100644
--- a/src/tdfx_hwcurs.c
+++ b/src/tdfx_hwcurs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_hwcurs.c,v 1.5 2001/10/28 03:33:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_hwcurs.c,v 1.4 2001/04/05 21:29:17 dawes Exp $ */
 /*
    Voodoo Banshee driver version 1.0.2
 
@@ -7,6 +7,10 @@
    Copyright: 1998,1999
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"
diff --git a/src/tdfx_io.c b/src/tdfx_io.c
index 5de08d7..ce5d5cc 100644
--- a/src/tdfx_io.c
+++ b/src/tdfx_io.c
@@ -24,7 +24,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/tdfx/tdfx_io.c,v 1.7 2001/04/05 21:29:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_io.c,v 1.6 2000/08/25 16:25:36 tsi Exp $ */
 
 /*
  * Authors:
@@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/src/tdfx_priv.c b/src/tdfx_priv.c
index c4de4ce..47a078b 100644
--- a/src/tdfx_priv.c
+++ b/src/tdfx_priv.c
@@ -1,5 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c,v 1.16 2001/05/21 21:43:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_priv.c,v 1.15 2001/04/05 21:29:17 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tdfx_sli.c b/src/tdfx_sli.c
index 803a0db..6b16dd4 100644
--- a/src/tdfx_sli.c
+++ b/src/tdfx_sli.c
@@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_sli.c,v 1.7 2001/03/21 17:02:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_sli.c,v 1.6 2000/12/15 15:19:35 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86.h"
 #include "xf86_ansic.h"
diff --git a/src/tdfx_video.c b/src/tdfx_video.c
index 8657341..60d7b0b 100644
--- a/src/tdfx_video.c
+++ b/src/tdfx_video.c
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c,v 1.20tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "tdfx.h"
 #include "dixstruct.h"