[xserver-commit] xfree86/drivers/cirrus CirrusClk.c,1.9,1.10 alp_driver.c,1.36,1.37 alp_hwcurs.c,1.5,1.6 alp_i2c.c,1.3,1.4 alp_xaa.c,1.8,1.9 alp_xaam.c,1.8,1.9 cir_dga.c,1.7,1.8 cir_driver.c,1.69,1.70 cir_shadow.c,1.1,1.2 lg_driver.c,1.50,1.51 lg_hwcurs.c,1.5,1.6 lg_i2c.c,1.4,1.5 lg_xaa.c,1.5,1.6

[Keith Packard]

Committed by: keithp

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

Modified Files:
	CirrusClk.c alp_driver.c alp_hwcurs.c alp_i2c.c alp_xaa.c 
	alp_xaam.c cir_dga.c cir_driver.c cir_shadow.c lg_driver.c 
	lg_hwcurs.c lg_i2c.c lg_xaa.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: CirrusClk.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/CirrusClk.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/CirrusClk.c	26 Dec 1999 18:24:14 -0000	1.9
+++ b/CirrusClk.c	28 Feb 2004 01:27:38 -0000	1.10
@@ -13,6 +13,9 @@
  * into the specific sub-drivers.  Derek Fawcus <derek@spider.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: alp_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/alp_driver.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- a/alp_driver.c	7 Nov 2003 22:49:58 -0000	1.36
+++ b/alp_driver.c	28 Feb 2004 01:27:38 -0000	1.37
@@ -14,6 +14,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.35 2003/11/03 05:11:09 tsi Exp $ */
 
 /* All drivers should typically include these */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 

Index: alp_hwcurs.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/alp_hwcurs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/alp_hwcurs.c	7 May 2001 21:59:06 -0000	1.5
+++ b/alp_hwcurs.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -2,6 +2,9 @@
 
 /* (c) Itai Nahshon */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: alp_i2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/alp_i2c.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/alp_i2c.c	6 Dec 2000 15:35:15 -0000	1.3
+++ b/alp_i2c.c	28 Feb 2004 01:27:38 -0000	1.4
@@ -2,6 +2,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.6 1999/02/28 11:19:38 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: alp_xaa.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/alp_xaa.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/alp_xaa.c	25 Jan 2002 21:56:00 -0000	1.8
+++ b/alp_xaa.c	28 Feb 2004 01:27:38 -0000	1.9
@@ -2,6 +2,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: alp_xaam.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/alp_xaam.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/alp_xaam.c	10 Jul 2002 02:36:50 -0000	1.8
+++ b/alp_xaam.c	28 Feb 2004 01:27:38 -0000	1.9
@@ -2,6 +2,9 @@
 /* #define DEBUG */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: cir_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/cir_dga.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/cir_dga.c	1 Oct 2001 13:44:05 -0000	1.7
+++ b/cir_dga.c	28 Feb 2004 01:27:38 -0000	1.8
@@ -24,6 +24,9 @@
  *           by: Egbert Eich
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: cir_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/cir_driver.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- a/cir_driver.c	18 Jun 2003 16:17:38 -0000	1.69
+++ b/cir_driver.c	28 Feb 2004 01:27:38 -0000	1.70
@@ -14,6 +14,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */
 
 /* All drivers should typically include these */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 

Index: cir_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/cir_shadow.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/cir_shadow.c	8 Feb 2000 13:13:14 -0000	1.1
+++ b/cir_shadow.c	28 Feb 2004 01:27:38 -0000	1.2
@@ -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: lg_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/lg_driver.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- a/lg_driver.c	7 Nov 2003 22:49:58 -0000	1.50
+++ b/lg_driver.c	28 Feb 2004 01:27:38 -0000	1.51
@@ -15,6 +15,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.49 2003/11/03 05:11:09 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define EXPERIMENTAL
 
 /* All drivers should typically include these */

Index: lg_hwcurs.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/lg_hwcurs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/lg_hwcurs.c	7 May 2001 21:59:06 -0000	1.5
+++ b/lg_hwcurs.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -12,6 +12,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: lg_i2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/lg_i2c.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/lg_i2c.c	6 Dec 2000 15:35:17 -0000	1.4
+++ b/lg_i2c.c	28 Feb 2004 01:27:38 -0000	1.5
@@ -2,6 +2,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.1 1998/11/15 04:30:25 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: lg_xaa.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/cirrus/lg_xaa.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/lg_xaa.c	15 Feb 2001 17:39:28 -0000	1.5
+++ b/lg_xaa.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -12,6 +12,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"