[xserver-commit] xfree86/os-support/bus Pci.c,1.83,1.84 Sbus.c,1.5,1.6 freebsdPci.c,1.6,1.7 linuxPci.c,1.11,1.12 netbsdPci.c,1.4,1.5

Keith Packard xserver-commit@pdx.freedesktop.org


Committed by: keithp

Update of /cvs/xserver/xfree86/os-support/bus
In directory pdx:/tmp/cvs-serv14744/os-support/bus

Modified Files:
	Pci.c Sbus.c freebsdPci.c linuxPci.c netbsdPci.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: Pci.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bus/Pci.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- a/Pci.c	19 Feb 2004 03:51:37 -0000	1.83
+++ b/Pci.c	28 Feb 2004 01:27:55 -0000	1.84
@@ -195,6 +195,9 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <errno.h>
 #include <signal.h>
 #include <X11/Xarch.h>

Index: Sbus.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bus/Sbus.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/Sbus.c	19 Feb 2004 03:51:37 -0000	1.5
+++ b/Sbus.c	28 Feb 2004 01:27:55 -0000	1.6
@@ -22,6 +22,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.4 2003/10/02 13:30:06 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>

Index: freebsdPci.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bus/freebsdPci.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/freebsdPci.c	2 Oct 2003 13:30:07 -0000	1.6
+++ b/freebsdPci.c	28 Feb 2004 01:27:55 -0000	1.7
@@ -45,6 +45,9 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include "compiler.h"
 #include "xf86.h"

Index: linuxPci.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bus/linuxPci.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/linuxPci.c	19 Feb 2004 03:51:37 -0000	1.11
+++ b/linuxPci.c	28 Feb 2004 01:27:55 -0000	1.12
@@ -45,6 +45,9 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include "compiler.h"
 #include "xf86.h"

Index: netbsdPci.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/bus/netbsdPci.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/netbsdPci.c	24 Aug 2003 17:37:04 -0000	1.4
+++ b/netbsdPci.c	28 Feb 2004 01:27:55 -0000	1.5
@@ -27,6 +27,9 @@
  * authorization from the XFree86 Project.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>