[xserver-commit] xfree86/drivers/i740 i740_accel.c,1.7,1.8 i740_cursor.c,1.5,1.6 i740_dga.c,1.2,1.3 i740_driver.c,1.50,1.51 i740_i2c.c,1.1,1.2 i740_io.c,1.5,1.6 i740_video.c,1.6,1.7

[Keith Packard]

Committed by: keithp

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

Modified Files:
	i740_accel.c i740_cursor.c i740_dga.c i740_driver.c i740_i2c.c 
	i740_io.c i740_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: i740_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i740/i740_accel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/i740_accel.c	21 Oct 2002 13:32:58 -0000	1.7
+++ b/i740_accel.c	28 Feb 2004 01:27:39 -0000	1.8
@@ -33,6 +33,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: i740_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i740/i740_cursor.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/i740_cursor.c	21 Oct 2002 13:32:58 -0000	1.5
+++ b/i740_cursor.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -33,6 +33,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: i740_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i740/i740_dga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/i740_dga.c	12 Feb 2003 21:46:42 -0000	1.2
+++ b/i740_dga.c	28 Feb 2004 01:27:39 -0000	1.3
@@ -24,6 +24,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i740/i740_dga.c,v 1.1tsi Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: i740_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i740/i740_driver.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- a/i740_driver.c	3 Nov 2003 05:11:16 -0000	1.50
+++ b/i740_driver.c	28 Feb 2004 01:27:39 -0000	1.51
@@ -41,6 +41,9 @@
  * DGA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef USE_DDC2
 #define USE_DDC2 0
 #endif

Index: i740_i2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i740/i740_i2c.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/i740_i2c.c	21 Oct 2002 13:32:58 -0000	1.1
+++ b/i740_i2c.c	28 Feb 2004 01:27:39 -0000	1.2
@@ -25,6 +25,9 @@
 
 /* not working at this time */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: i740_io.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i740/i740_io.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/i740_io.c	21 Oct 2002 13:32:58 -0000	1.5
+++ b/i740_io.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -32,6 +32,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"

Index: i740_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i740/i740_video.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/i740_video.c	10 Nov 2003 18:22:21 -0000	1.6
+++ b/i740_video.c	28 Feb 2004 01:27:39 -0000	1.7
@@ -51,6 +51,9 @@
  * i740_video.c: i740 Xv driver. Based on the mga Xv driver by Mark Vojkovich.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"