[xserver-commit] xfree86/drivers/nv nv_cursor.c,1.12,1.13 nv_dac.c,1.38,1.39 nv_dga.c,1.12,1.13 nv_driver.c,1.123,1.124 nv_hw.c,1.5,1.6 nv_setup.c,1.39,1.40 nv_shadow.c,1.6,1.7 nv_video.c,1.21,1.22 nv_xaa.c,1.34,1.35 riva_cursor.c,1.1,1.2 riva_dac.c,1.2,1.3 riva_dga.c,1.1,1.2 riva_driver.c,1.6,1.7 riva_hw.c,1.52,1.53 riva_setup.c,1.1,1.2 riva_shadow.c,1.1,1.2 riva_xaa.c,1.1,1.2

Keith Packard xserver-commit@pdx.freedesktop.org


Committed by: keithp

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

Modified Files:
	nv_cursor.c nv_dac.c nv_dga.c nv_driver.c nv_hw.c nv_setup.c 
	nv_shadow.c nv_video.c nv_xaa.c riva_cursor.c riva_dac.c 
	riva_dga.c riva_driver.c riva_hw.c riva_setup.c riva_shadow.c 
	riva_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: nv_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_cursor.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/nv_cursor.c	31 Jul 2003 20:24:29 -0000	1.12
+++ b/nv_cursor.c	28 Feb 2004 01:27:40 -0000	1.13
@@ -39,6 +39,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c,v 1.11 2002/11/26 23:41:58 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_include.h"
 
 #include "cursorstr.h"

Index: nv_dac.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_dac.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- a/nv_dac.c	6 Jan 2004 22:47:06 -0000	1.38
+++ b/nv_dac.c	28 Feb 2004 01:27:40 -0000	1.39
@@ -39,6 +39,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v 1.37 2003/09/08 20:00:27 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_include.h"
 
 Bool

Index: nv_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_dga.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/nv_dga.c	31 Jul 2003 20:24:29 -0000	1.12
+++ b/nv_dga.c	28 Feb 2004 01:27:40 -0000	1.13
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dga.c,v 1.11 2002/01/25 21:56:06 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_local.h"
 #include "nv_include.h"
 #include "nv_type.h"

Index: nv_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_driver.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- a/nv_driver.c	13 Jan 2004 19:03:28 -0000	1.123
+++ b/nv_driver.c	28 Feb 2004 01:27:40 -0000	1.124
@@ -26,6 +26,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.122 2004/01/10 22:31:53 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_include.h"
 
 #include "xf86int10.h"

Index: nv_hw.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_hw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/nv_hw.c	6 Jan 2004 22:47:07 -0000	1.5
+++ b/nv_hw.c	28 Feb 2004 01:27:40 -0000	1.6
@@ -38,6 +38,9 @@
  \***************************************************************************/
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.4 2003/11/03 05:11:25 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_local.h"
 #include "compiler.h"
 #include "nv_include.h"

Index: nv_setup.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_setup.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- a/nv_setup.c	7 Nov 2003 23:56:28 -0000	1.39
+++ b/nv_setup.c	28 Feb 2004 01:27:40 -0000	1.40
@@ -39,6 +39,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.38 2003/09/08 20:00:27 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_include.h"
 
 /*

Index: nv_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_shadow.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/nv_shadow.c	22 Jan 2001 21:32:36 -0000	1.6
+++ b/nv_shadow.c	28 Feb 2004 01:27:40 -0000	1.7
@@ -4,6 +4,9 @@
 */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.5 2000/03/13 18:49:29 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_local.h"
 #include "nv_include.h"
 #include "nv_type.h"

Index: nv_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_video.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/nv_video.c	10 Nov 2003 18:22:24 -0000	1.21
+++ b/nv_video.c	28 Feb 2004 01:27:40 -0000	1.22
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.20tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: nv_xaa.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/nv_xaa.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- a/nv_xaa.c	15 Oct 2003 20:28:31 -0000	1.34
+++ b/nv_xaa.c	28 Feb 2004 01:27:40 -0000	1.35
@@ -39,6 +39,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c,v 1.33 2003/09/21 00:17:34 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "nv_include.h"
 #include "xaalocal.h"
 #include "miline.h"

Index: riva_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_cursor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/riva_cursor.c	31 Jul 2003 20:24:29 -0000	1.1
+++ b/riva_cursor.c	28 Feb 2004 01:27:40 -0000	1.2
@@ -25,6 +25,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_cursor.c $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_include.h"
 
 #include "cursorstr.h"

Index: riva_dac.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_dac.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/riva_dac.c	16 Sep 2003 00:17:46 -0000	1.2
+++ b/riva_dac.c	28 Feb 2004 01:27:40 -0000	1.3
@@ -25,6 +25,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_dac.c,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_include.h"
 
 Bool

Index: riva_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_dga.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/riva_dga.c	31 Jul 2003 20:24:29 -0000	1.1
+++ b/riva_dga.c	28 Feb 2004 01:27:40 -0000	1.2
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/riva/riva_dga.c $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_local.h"
 #include "riva_include.h"
 #include "riva_type.h"

Index: riva_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_driver.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/riva_driver.c	10 Jan 2004 22:31:53 -0000	1.6
+++ b/riva_driver.c	28 Feb 2004 01:27:40 -0000	1.7
@@ -25,6 +25,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,v 1.5 2003/11/03 05:11:26 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_include.h"
 
 #include "xf86int10.h"

Index: riva_hw.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_hw.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- a/riva_hw.c	3 Nov 2003 05:11:26 -0000	1.52
+++ b/riva_hw.c	28 Feb 2004 01:27:40 -0000	1.53
@@ -38,6 +38,9 @@
  \***************************************************************************/
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v 1.51tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_local.h"
 #include "compiler.h"
 #include "riva_include.h"

Index: riva_setup.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/riva_setup.c	31 Jul 2003 20:24:31 -0000	1.1
+++ b/riva_setup.c	28 Feb 2004 01:27:40 -0000	1.2
@@ -25,6 +25,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_setup.c $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_include.h"
 
 /*

Index: riva_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_shadow.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/riva_shadow.c	31 Jul 2003 20:24:31 -0000	1.1
+++ b/riva_shadow.c	28 Feb 2004 01:27:40 -0000	1.2
@@ -4,6 +4,9 @@
 */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_shadow.c $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_local.h"
 #include "riva_include.h"
 #include "riva_type.h"

Index: riva_xaa.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/nv/riva_xaa.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/riva_xaa.c	31 Jul 2003 20:24:31 -0000	1.1
+++ b/riva_xaa.c	28 Feb 2004 01:27:40 -0000	1.2
@@ -42,6 +42,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_xaa.c $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "riva_include.h"
 #include "xaalocal.h"
 #include "xaarop.h"