[xserver-commit] xfree86/drivers/sis init.c,1.46,1.47 init301.c,1.69,1.70 sis300_accel.c,1.27,1.28 sis310_accel.c,1.37,1.38 sis6326_video.c,1.17,1.18 sis_accel.c,1.37,1.38 sis_cursor.c,1.27,1.28 sis_dac.c,1.57,1.58 sis_dga.c,1.13,1.14 sis_dri.c,1.41,1.42 sis_driver.c,1.176,1.177 sis_opt.c,1.55,1.56 sis_setup.c,1.29,1.30 sis_shadow.c,1.10,1.11 sis_vb.c,1.41,1.42 sis_vga.c,1.43,1.44 sis_video.c,1.48,1.49

Keith Packard xserver-commit@pdx.freedesktop.org
Previous message: [xserver-commit] xfree86/drivers/sunbw2 bw2_driver.c,1.4,1.5
Next message: [xserver-commit] xfree86/drivers/suncg3 cg3_driver.c,1.5,1.6
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Committed by: keithp

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

Modified Files:
	init.c init301.c sis300_accel.c sis310_accel.c sis6326_video.c 
	sis_accel.c sis_cursor.c sis_dac.c sis_dga.c sis_dri.c 
	sis_driver.c sis_opt.c sis_setup.c sis_shadow.c sis_vb.c 
	sis_vga.c sis_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: init.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/init.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- a/init.c	24 Jan 2004 21:29:20 -0000	1.46
+++ b/init.c	28 Feb 2004 01:27:47 -0000	1.47
@@ -66,6 +66,9 @@
  *
  */
  
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "init.h"
 
 #ifdef SIS300

Index: init301.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/init301.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- a/init301.c	23 Jan 2004 22:29:02 -0000	1.69
+++ b/init301.c	28 Feb 2004 01:27:47 -0000	1.70
@@ -66,6 +66,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if 1
 #define SET_EMI		/* 302LV/ELV: Set EMI values */
 #endif

Index: sis300_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis300_accel.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/sis300_accel.c	23 Jan 2004 22:29:04 -0000	1.27
+++ b/sis300_accel.c	28 Feb 2004 01:27:47 -0000	1.28
@@ -34,6 +34,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if 0
 #define DEBUG
 #endif

Index: sis310_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis310_accel.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- a/sis310_accel.c	27 Jan 2004 11:58:27 -0000	1.37
+++ b/sis310_accel.c	28 Feb 2004 01:27:47 -0000	1.38
@@ -36,6 +36,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: sis6326_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis6326_video.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/sis6326_video.c	23 Jan 2004 22:29:04 -0000	1.17
+++ b/sis6326_video.c	28 Feb 2004 01:27:47 -0000	1.18
@@ -33,6 +33,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "sis.h"
 
 #include "xf86.h"

Index: sis_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_accel.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- a/sis_accel.c	4 Jan 2004 18:07:59 -0000	1.37
+++ b/sis_accel.c	28 Feb 2004 01:27:48 -0000	1.38
@@ -33,6 +33,9 @@
  *	     Thomas Winischhofer <thomas@winischhofer.net>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if 0
 #define CTSCE		/* TW: Include enhanced color expansion code */
 #endif			/*     This produces drawing errors sometimes */

Index: sis_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_cursor.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/sis_cursor.c	23 Jan 2004 22:29:04 -0000	1.27
+++ b/sis_cursor.c	28 Feb 2004 01:27:48 -0000	1.28
@@ -35,6 +35,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86PciInfo.h"
 #include "cursorstr.h"

Index: sis_dac.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_dac.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- a/sis_dac.c	2 Feb 2004 03:55:29 -0000	1.57
+++ b/sis_dac.c	28 Feb 2004 01:27:48 -0000	1.58
@@ -45,6 +45,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: sis_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_dga.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/sis_dga.c	4 Jan 2004 18:08:00 -0000	1.13
+++ b/sis_dga.c	28 Feb 2004 01:27:48 -0000	1.14
@@ -33,6 +33,9 @@
  *           Thomas Winischhofer <thomas@winischhofer.net>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: sis_dri.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_dri.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- a/sis_dri.c	4 Jan 2004 18:08:00 -0000	1.41
+++ b/sis_dri.c	28 Feb 2004 01:27:48 -0000	1.42
@@ -35,6 +35,9 @@
  *		others.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: sis_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_driver.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- a/sis_driver.c	24 Jan 2004 21:29:20 -0000	1.176
+++ b/sis_driver.c	28 Feb 2004 01:27:48 -0000	1.177
@@ -47,6 +47,9 @@
  *           David Thomas <davtom@dream.org.uk>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "fb.h"
 #include "mibank.h"
 #include "micmap.h"

Index: sis_opt.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_opt.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- a/sis_opt.c	23 Jan 2004 22:29:05 -0000	1.55
+++ b/sis_opt.c	28 Feb 2004 01:27:48 -0000	1.56
@@ -37,6 +37,9 @@
  *              ?
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86PciInfo.h"
 #include "xf86str.h"

Index: sis_setup.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_setup.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- a/sis_setup.c	23 Jan 2004 22:29:05 -0000	1.29
+++ b/sis_setup.c	28 Feb 2004 01:27:48 -0000	1.30
@@ -35,6 +35,9 @@
  *
  */
  
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86.h"

Index: sis_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_shadow.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/sis_shadow.c	4 Jan 2004 18:08:00 -0000	1.10
+++ b/sis_shadow.c	28 Feb 2004 01:27:48 -0000	1.11
@@ -27,6 +27,9 @@
  *     active when DGA is active and vice versa.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: sis_vb.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_vb.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- a/sis_vb.c	23 Jan 2004 22:29:06 -0000	1.41
+++ b/sis_vb.c	28 Feb 2004 01:27:48 -0000	1.42
@@ -33,6 +33,9 @@
  *		
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "compiler.h"

Index: sis_vga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_vga.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- a/sis_vga.c	23 Jan 2004 22:29:06 -0000	1.43
+++ b/sis_vga.c	28 Feb 2004 01:27:48 -0000	1.44
@@ -36,6 +36,9 @@
  * Hourihane, Wigan, England
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: sis_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/sis/sis_video.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- a/sis_video.c	23 Jan 2004 22:29:06 -0000	1.48
+++ b/sis_video.c	28 Feb 2004 01:27:48 -0000	1.49
@@ -84,6 +84,9 @@
  * 	 XvOnCRT2 flag.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
Previous message: [xserver-commit] xfree86/drivers/sunbw2 bw2_driver.c,1.4,1.5
Next message: [xserver-commit] xfree86/drivers/suncg3 cg3_driver.c,1.5,1.6
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]