[xserver-commit] xfree86/drivers/s3 s3_IBMRGB.c,1.6,1.7 s3_Ti.c,1.6,1.7 s3_Trio64DAC.c,1.8,1.9 s3_accel.c,1.3,1.4 s3_bios.c,1.3,1.4 s3_cursor.c,1.2,1.3 s3_dga.c,1.1,1.2 s3_driver.c,1.20,1.21 s3_video.c,1.5,1.6

[Keith Packard]

Committed by: keithp

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

Modified Files:
	s3_IBMRGB.c s3_Ti.c s3_Trio64DAC.c s3_accel.c s3_bios.c 
	s3_cursor.c s3_dga.c s3_driver.c s3_video.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: s3_IBMRGB.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_IBMRGB.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/s3_IBMRGB.c	17 Jul 2003 08:19:36 -0000	1.6
+++ b/s3_IBMRGB.c	28 Feb 2004 01:27:42 -0000	1.7
@@ -27,6 +27,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_IBMRGB.c,v 1.4 2002/12/11 17:30:48 dawes Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: s3_Ti.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_Ti.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/s3_Ti.c	17 Jul 2003 08:19:36 -0000	1.6
+++ b/s3_Ti.c	28 Feb 2004 01:27:42 -0000	1.7
@@ -26,6 +26,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Ti.c,v 1.4 2001/10/28 03:33:44 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: s3_Trio64DAC.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_Trio64DAC.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/s3_Trio64DAC.c	3 Nov 2003 05:11:28 -0000	1.8
+++ b/s3_Trio64DAC.c	28 Feb 2004 01:27:42 -0000	1.9
@@ -26,6 +26,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Trio64DAC.c,v 1.7tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: s3_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_accel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/s3_accel.c	23 Nov 2003 18:07:31 -0000	1.3
+++ b/s3_accel.c	28 Feb 2004 01:27:42 -0000	1.4
@@ -27,6 +27,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 
 #include "miline.h"

Index: s3_bios.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_bios.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/s3_bios.c	25 Jan 2002 21:56:08 -0000	1.3
+++ b/s3_bios.c	28 Feb 2004 01:27:42 -0000	1.4
@@ -26,6 +26,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_bios.c,v 1.2 2001/07/11 07:45:35 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: s3_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_cursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/s3_cursor.c	17 Jul 2003 08:19:36 -0000	1.2
+++ b/s3_cursor.c	28 Feb 2004 01:27:42 -0000	1.3
@@ -26,6 +26,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: s3_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_dga.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/s3_dga.c	2 Jul 2001 10:46:04 -0000	1.1
+++ b/s3_dga.c	28 Feb 2004 01:27:42 -0000	1.2
@@ -26,6 +26,9 @@
  */
 /* $XFree86: $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: s3_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_driver.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- a/s3_driver.c	3 Nov 2003 05:11:28 -0000	1.20
+++ b/s3_driver.c	28 Feb 2004 01:27:42 -0000	1.21
@@ -37,6 +37,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c,v 1.19tsi Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: s3_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/s3/s3_video.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/s3_video.c	10 Nov 2003 18:22:25 -0000	1.5
+++ b/s3_video.c	28 Feb 2004 01:27:42 -0000	1.6
@@ -26,6 +26,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_video.c,v 1.4tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"