[xserver-commit] xfree86/drivers/apm apm_accel.c,1.21,1.22 apm_cursor.c,1.15,1.16 apm_dga.c,1.10,1.11 apm_driver.c,1.66,1.67 apm_funcs.c,1.19,1.20 apm_i2c.c,1.7,1.8 apm_rush.c,1.12,1.13 apm_video.c,1.12,1.13

[Keith Packard]

Committed by: keithp

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

Modified Files:
	apm_accel.c apm_cursor.c apm_dga.c apm_driver.c apm_funcs.c 
	apm_i2c.c apm_rush.c apm_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: apm_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_accel.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/apm_accel.c	8 Oct 2002 22:14:03 -0000	1.21
+++ b/apm_accel.c	28 Feb 2004 01:27:38 -0000	1.22
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.20tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "apm.h"
 #include "miline.h"
 

Index: apm_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_cursor.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/apm_cursor.c	30 Oct 2003 18:37:20 -0000	1.15
+++ b/apm_cursor.c	28 Feb 2004 01:27:38 -0000	1.16
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "X.h"
 #include "Xproto.h"
 #include "misc.h"

Index: apm_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_dga.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/apm_dga.c	25 Jan 2002 21:55:54 -0000	1.10
+++ b/apm_dga.c	28 Feb 2004 01:27:38 -0000	1.11
@@ -5,6 +5,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: apm_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_driver.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- a/apm_driver.c	30 Oct 2003 18:37:20 -0000	1.66
+++ b/apm_driver.c	28 Feb 2004 01:27:38 -0000	1.67
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.65 2003/10/30 17:36:57 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "apm.h"
 #include "xf86cmap.h"
 #include "shadowfb.h"

Index: apm_funcs.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_funcs.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/apm_funcs.c	3 Nov 2003 05:11:04 -0000	1.19
+++ b/apm_funcs.c	28 Feb 2004 01:27:38 -0000	1.20
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.18tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define FASTER
 #ifndef PSZ
 #define PSZ	8

Index: apm_i2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_i2c.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/apm_i2c.c	25 Jan 2002 21:55:55 -0000	1.7
+++ b/apm_i2c.c	28 Feb 2004 01:27:38 -0000	1.8
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.6.4.1 2001/11/28 22:35:13 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "apm.h"
 #include "apm_regs.h"
 

Index: apm_rush.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_rush.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/apm_rush.c	12 Feb 2003 21:46:42 -0000	1.12
+++ b/apm_rush.c	28 Feb 2004 01:27:38 -0000	1.13
@@ -3,6 +3,9 @@
  * Copyright Loïc Grenié 1999
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "apm.h"
 #include "xaalocal.h"
 

Index: apm_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/apm/apm_video.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/apm_video.c	10 Nov 2003 18:22:17 -0000	1.12
+++ b/apm_video.c	28 Feb 2004 01:27:38 -0000	1.13
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.11tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if PSZ != 24
 #include "dixstruct.h"
 #include "fourcc.h"