[xserver-commit] xfree86/drivers/mga clientlx.c,1.1,1.2 mga_arc.c,1.12,1.13 mga_dac3026.c,1.58,1.59 mga_dacG.c,1.54,1.55 mga_dga.c,1.17,1.18 mga_dh.c,1.5,1.6 mga_dri.c,1.32,1.33 mga_driver.c,1.244,1.245 mga_esc.c,1.3,1.4 mga_g450pll.c,1.9,1.10 mga_halmod.c,1.1,1.2 mga_hwcurs.c,1.9,1.10 mga_merge.c,1.5,1.6 mga_shadow.c,1.3,1.4 mga_storm.c,1.99,1.100 mga_video.c,1.33,1.34

Keith Packard xserver-commit@pdx.freedesktop.org


Committed by: keithp

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

Modified Files:
	clientlx.c mga_arc.c mga_dac3026.c mga_dacG.c mga_dga.c 
	mga_dh.c mga_dri.c mga_driver.c mga_esc.c mga_g450pll.c 
	mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c mga_storm.c 
	mga_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: clientlx.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/clientlx.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/clientlx.c	24 Oct 2000 22:45:06 -0000	1.1
+++ b/clientlx.c	28 Feb 2004 01:27:39 -0000	1.2
@@ -7,6 +7,9 @@
     All Rights Reserved.
 
 \******************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
 #include "xf86_ansic.h"

Index: mga_arc.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_arc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/mga_arc.c	16 Jul 2003 03:08:37 -0000	1.12
+++ b/mga_arc.c	28 Feb 2004 01:27:39 -0000	1.13
@@ -26,6 +26,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_arc.c,v 1.11 2003/07/16 01:38:45 dawes Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "gcstruct.h"
 #include "windowstr.h"

Index: mga_dac3026.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_dac3026.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- a/mga_dac3026.c	3 Nov 2003 05:11:17 -0000	1.58
+++ b/mga_dac3026.c	28 Feb 2004 01:27:39 -0000	1.59
@@ -37,6 +37,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: mga_dacG.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_dacG.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- a/mga_dacG.c	3 Nov 2003 05:11:17 -0000	1.54
+++ b/mga_dacG.c	28 Feb 2004 01:27:39 -0000	1.55
@@ -9,6 +9,9 @@
  * new server design (DHD).
  */                     
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "colormapst.h"
 
 /* All drivers should typically include these */

Index: mga_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_dga.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/mga_dga.c	8 Oct 2003 15:48:41 -0000	1.17
+++ b/mga_dga.c	28 Feb 2004 01:27:39 -0000	1.18
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dga.c,v 1.14 1999/11/02 23:12:00 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: mga_dh.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_dh.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/mga_dh.c	3 Nov 2003 05:11:17 -0000	1.5
+++ b/mga_dh.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -7,6 +7,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: mga_dri.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_dri.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- a/mga_dri.c	6 Nov 2003 18:38:04 -0000	1.32
+++ b/mga_dri.c	28 Feb 2004 01:27:39 -0000	1.33
@@ -28,6 +28,9 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: mga_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_driver.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- a/mga_driver.c	3 Nov 2003 05:11:17 -0000	1.244
+++ b/mga_driver.c	28 Feb 2004 01:27:39 -0000	1.245
@@ -54,6 +54,9 @@
 
 
 /* All drivers should typically include these */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: mga_esc.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_esc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/mga_esc.c	31 Oct 2003 15:06:25 -0000	1.3
+++ b/mga_esc.c	28 Feb 2004 01:27:39 -0000	1.4
@@ -7,6 +7,9 @@
 * (C) Matrox Graphics, Inc.
 *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef USEMGAHAL
 
 /* All drivers should typically include these */

Index: mga_g450pll.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_g450pll.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/mga_g450pll.c	3 Nov 2003 05:11:18 -0000	1.9
+++ b/mga_g450pll.c	28 Feb 2004 01:27:39 -0000	1.10
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_g450pll.c,v 1.8tsi Exp $ */
 
 /* 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: mga_halmod.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_halmod.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/mga_halmod.c	6 Dec 2000 15:35:21 -0000	1.1
+++ b/mga_halmod.c	28 Feb 2004 01:27:39 -0000	1.2
@@ -1,4 +1,7 @@
 /* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86Module.h"
 
 #ifdef XFree86LOADER

Index: mga_hwcurs.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_hwcurs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/mga_hwcurs.c	14 Mar 1999 03:22:00 -0000	1.9
+++ b/mga_hwcurs.c	28 Feb 2004 01:27:39 -0000	1.10
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_hwcurs.c,v 1.8tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: mga_merge.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_merge.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/mga_merge.c	2 Nov 2003 04:24:36 -0000	1.5
+++ b/mga_merge.c	28 Feb 2004 01:27:39 -0000	1.6
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_merge.c,v 1.4 2003/09/24 02:43:24 dawes Exp $ */
 
 /* All drivers should typically include these */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: mga_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_shadow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/mga_shadow.c	8 Feb 2000 13:13:18 -0000	1.3
+++ b/mga_shadow.c	28 Feb 2004 01:27:39 -0000	1.4
@@ -5,6 +5,9 @@
    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: mga_storm.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_storm.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- a/mga_storm.c	29 Jan 2004 03:28:25 -0000	1.99
+++ b/mga_storm.c	28 Feb 2004 01:27:39 -0000	1.100
@@ -2,6 +2,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: mga_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/mga/mga_video.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- a/mga_video.c	10 Nov 2003 18:22:23 -0000	1.33
+++ b/mga_video.c	28 Feb 2004 01:27:39 -0000	1.34
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_video.c,v 1.32tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"