[xserver-commit] xfree86/drivers/neomagic neo_2070.c,1.5,1.6 neo_2090.c,1.7,1.8 neo_2097.c,1.12,1.13 neo_2200.c,1.20,1.21 neo_bank.c,1.4,1.5 neo_cursor.c,1.9,1.10 neo_dga.c,1.5,1.6 neo_driver.c,1.74,1.75 neo_i2c.c,1.5,1.6 neo_shadow.c,1.3,1.4 neo_video.c,1.7,1.8

[Keith Packard]

Committed by: keithp

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

Modified Files:
	neo_2070.c neo_2090.c neo_2097.c neo_2200.c neo_bank.c 
	neo_cursor.c neo_dga.c neo_driver.c neo_i2c.c neo_shadow.c 
	neo_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: neo_2070.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_2070.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/neo_2070.c	30 Oct 2002 12:52:21 -0000	1.5
+++ b/neo_2070.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -36,6 +36,9 @@
  *   1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: neo_2090.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_2090.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/neo_2090.c	30 Oct 2002 12:52:21 -0000	1.7
+++ b/neo_2090.c	28 Feb 2004 01:27:39 -0000	1.8
@@ -36,6 +36,9 @@
  *   1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: neo_2097.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_2097.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/neo_2097.c	10 Dec 2002 17:36:29 -0000	1.12
+++ b/neo_2097.c	28 Feb 2004 01:27:39 -0000	1.13
@@ -40,6 +40,9 @@
  * This module supports acceleration for 2097 and 2160.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: neo_2200.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_2200.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- a/neo_2200.c	12 Jan 2003 03:55:48 -0000	1.20
+++ b/neo_2200.c	28 Feb 2004 01:27:39 -0000	1.21
@@ -35,6 +35,9 @@
  *   1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: neo_bank.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_bank.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/neo_bank.c	30 Oct 2002 12:52:21 -0000	1.4
+++ b/neo_bank.c	28 Feb 2004 01:27:39 -0000	1.5
@@ -36,6 +36,9 @@
  *   1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define PSZ 8
 
 /* All drivers should typically include these */

Index: neo_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_cursor.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/neo_cursor.c	30 Oct 2002 12:52:21 -0000	1.9
+++ b/neo_cursor.c	28 Feb 2004 01:27:39 -0000	1.10
@@ -38,6 +38,9 @@
 
 
 /* All drivers should typically include these */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h" 

Index: neo_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_dga.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/neo_dga.c	4 Apr 2002 14:05:44 -0000	1.5
+++ b/neo_dga.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c,v 1.4 2001/10/01 13:44:07 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: neo_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_driver.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- a/neo_driver.c	31 Dec 2003 05:07:30 -0000	1.74
+++ b/neo_driver.c	28 Feb 2004 01:27:39 -0000	1.75
@@ -45,6 +45,9 @@
  */
 
 /* All drivers should typically include these */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: neo_i2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_i2c.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/neo_i2c.c	30 Oct 2002 12:52:22 -0000	1.5
+++ b/neo_i2c.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -36,6 +36,9 @@
  *   1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: neo_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_shadow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/neo_shadow.c	14 Jun 2001 02:23:49 -0000	1.3
+++ b/neo_shadow.c	28 Feb 2004 01:27:39 -0000	1.4
@@ -5,6 +5,9 @@
    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"

Index: neo_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/neomagic/neo_video.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/neo_video.c	10 Nov 2003 18:22:23 -0000	1.7
+++ b/neo_video.c	28 Feb 2004 01:27:39 -0000	1.8
@@ -28,6 +28,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_video.c,v 1.6tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "neo.h"
 #include "neo_video.h"