[xserver-commit] xfree86/drivers/i810 i810_accel.c,1.22,1.23 i810_cursor.c,1.7,1.8 i810_dga.c,1.6,1.7 i810_dri.c,1.42,1.43 i810_driver.c,1.102,1.103 i810_hwmc.c,1.4,1.5 i810_io.c,1.5,1.6 i810_memory.c,1.28,1.29 i810_video.c,1.27,1.28 i810_wmark.c,1.8,1.9 i830_accel.c,1.9,1.10 i830_cursor.c,1.7,1.8 i830_dga.c,1.3,1.4 i830_dri.c,1.16,1.17 i830_driver.c,1.49,1.50 i830_memory.c,1.10,1.11 i830_video.c,1.12,1.13

Keith Packard xserver-commit@pdx.freedesktop.org


Committed by: keithp

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

Modified Files:
	i810_accel.c i810_cursor.c i810_dga.c i810_dri.c i810_driver.c 
	i810_hwmc.c i810_io.c i810_memory.c i810_video.c i810_wmark.c 
	i830_accel.c i830_cursor.c i830_dga.c i830_dri.c i830_driver.c 
	i830_memory.c i830_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: i810_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_accel.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- a/i810_accel.c	3 Jan 2004 02:11:53 -0000	1.22
+++ b/i810_accel.c	28 Feb 2004 01:27:39 -0000	1.23
@@ -46,6 +46,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86_ansic.h"
 #include "xf86.h"
 #include "xaarop.h"

Index: i810_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_cursor.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/i810_cursor.c	30 Oct 2002 12:52:17 -0000	1.7
+++ b/i810_cursor.c	28 Feb 2004 01:27:39 -0000	1.8
@@ -46,6 +46,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: i810_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_dga.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/i810_dga.c	26 Feb 2003 04:19:36 -0000	1.6
+++ b/i810_dga.c	28 Feb 2004 01:27:39 -0000	1.7
@@ -36,6 +36,9 @@
 
 /* $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"
 #include "xf86_ansic.h"

Index: i810_dri.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_dri.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- a/i810_dri.c	28 Sep 2003 20:15:58 -0000	1.42
+++ b/i810_dri.c	28 Feb 2004 01:27:39 -0000	1.43
@@ -12,6 +12,9 @@
  * 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"

Index: i810_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_driver.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- a/i810_driver.c	2 Jan 2004 22:16:18 -0000	1.102
+++ b/i810_driver.c	28 Feb 2004 01:27:39 -0000	1.103
@@ -56,6 +56,9 @@
 /*
  * These are X and server generic header files.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"

Index: i810_hwmc.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_hwmc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/i810_hwmc.c	11 Sep 2002 00:29:32 -0000	1.4
+++ b/i810_hwmc.c	28 Feb 2004 01:27:39 -0000	1.5
@@ -35,6 +35,9 @@
 /* $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"
 #include "xf86Resources.h"

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

Index: i810_memory.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_memory.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- a/i810_memory.c	24 Sep 2003 02:43:23 -0000	1.28
+++ b/i810_memory.c	28 Feb 2004 01:27:39 -0000	1.29
@@ -45,6 +45,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"

Index: i810_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_video.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/i810_video.c	11 Nov 2003 00:58:18 -0000	1.27
+++ b/i810_video.c	28 Feb 2004 01:27:39 -0000	1.28
@@ -34,6 +34,9 @@
  *        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"

Index: i810_wmark.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i810_wmark.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/i810_wmark.c	30 Oct 2002 12:52:18 -0000	1.8
+++ b/i810_wmark.c	28 Feb 2004 01:27:39 -0000	1.9
@@ -45,6 +45,9 @@
  *   Keith Whitwell <keith@tungstengraphics.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "i810.h"
 

Index: i830_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i830_accel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/i830_accel.c	22 Dec 2003 12:27:07 -0000	1.9
+++ b/i830_accel.c	28 Feb 2004 01:27:39 -0000	1.10
@@ -2,6 +2,9 @@
  * 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

Index: i830_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i830_cursor.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/i830_cursor.c	18 Jun 2003 13:14:17 -0000	1.7
+++ b/i830_cursor.c	28 Feb 2004 01:27:39 -0000	1.8
@@ -48,6 +48,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: i830_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i830_dga.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/i830_dga.c	26 Feb 2003 04:11:23 -0000	1.3
+++ b/i830_dga.c	28 Feb 2004 01:27:39 -0000	1.4
@@ -36,6 +36,9 @@
 
 /* $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"

Index: i830_dri.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i830_dri.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/i830_dri.c	28 Sep 2003 20:15:58 -0000	1.16
+++ b/i830_dri.c	28 Feb 2004 01:27:39 -0000	1.17
@@ -58,6 +58,9 @@
  * DHD 07/2002
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: i830_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i830_driver.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- a/i830_driver.c	25 Jan 2004 16:57:48 -0000	1.49
+++ b/i830_driver.c	28 Feb 2004 01:27:39 -0000	1.50
@@ -137,6 +137,9 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef PRINT_MODE_INFO
 #define PRINT_MODE_INFO 0
 #endif

Index: i830_memory.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i830_memory.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/i830_memory.c	21 Oct 2003 02:17:52 -0000	1.10
+++ b/i830_memory.c	28 Feb 2004 01:27:39 -0000	1.11
@@ -48,6 +48,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"

Index: i830_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/i810/i830_video.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/i830_video.c	10 Nov 2003 18:22:22 -0000	1.12
+++ b/i830_video.c	28 Feb 2004 01:27:39 -0000	1.13
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define VIDEO_DEBUG 0
 /***************************************************************************