summaryrefslogtreecommitdiff
path: root/hw/xfree86/os-support/bus
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/os-support/bus')
-rw-r--r--hw/xfree86/os-support/bus/460gxPCI.c4
-rw-r--r--hw/xfree86/os-support/bus/460gxPCI.h4
-rw-r--r--hw/xfree86/os-support/bus/Pci.c4
-rw-r--r--hw/xfree86/os-support/bus/Pci.h4
-rw-r--r--hw/xfree86/os-support/bus/Sbus.c4
-rw-r--r--hw/xfree86/os-support/bus/altixPCI.c4
-rw-r--r--hw/xfree86/os-support/bus/altixPCI.h4
-rw-r--r--hw/xfree86/os-support/bus/axpPci.c6
-rw-r--r--hw/xfree86/os-support/bus/e8870PCI.c4
-rw-r--r--hw/xfree86/os-support/bus/e8870PCI.h4
-rw-r--r--hw/xfree86/os-support/bus/freebsdPci.c8
-rw-r--r--hw/xfree86/os-support/bus/ix86Pci.c4
-rw-r--r--hw/xfree86/os-support/bus/linuxPci.c4
-rw-r--r--hw/xfree86/os-support/bus/netbsdPci.c4
-rw-r--r--hw/xfree86/os-support/bus/ppcPci.c4
-rw-r--r--hw/xfree86/os-support/bus/sparcPci.c4
-rw-r--r--hw/xfree86/os-support/bus/xf86Pci.h4
-rw-r--r--hw/xfree86/os-support/bus/xf86Sbus.h4
-rw-r--r--hw/xfree86/os-support/bus/zx1PCI.c4
-rw-r--r--hw/xfree86/os-support/bus/zx1PCI.h4
20 files changed, 83 insertions, 3 deletions
diff --git a/hw/xfree86/os-support/bus/460gxPCI.c b/hw/xfree86/os-support/bus/460gxPCI.c
index 9855b8b41..255dfa12f 100644
--- a/hw/xfree86/os-support/bus/460gxPCI.c
+++ b/hw/xfree86/os-support/bus/460gxPCI.c
@@ -29,6 +29,10 @@
* This file contains the glue necessary for support of Intel's 460GX chipset.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include "460gxPCI.h"
#include "xf86.h"
#include "Pci.h"
diff --git a/hw/xfree86/os-support/bus/460gxPCI.h b/hw/xfree86/os-support/bus/460gxPCI.h
index 9459705d0..65a19b2f0 100644
--- a/hw/xfree86/os-support/bus/460gxPCI.h
+++ b/hw/xfree86/os-support/bus/460gxPCI.h
@@ -25,6 +25,10 @@
* XFree86 Project.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#ifndef PCI_460GX_H
#define PCI_460GX_H 1
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index c1c08569e..d837ec92e 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -195,6 +195,10 @@
* authorization from the copyright holder(s) and author(s).
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <errno.h>
#include <signal.h>
#include <X11/Xarch.h>
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 4a6ff672a..ee6e9d723 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -101,6 +101,10 @@
* This file has the private Pci definitions. The public ones are imported
* from xf86Pci.h. Drivers should not use this file.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#ifndef _PCI_H
#define _PCI_H 1
diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index efe5c4ba6..168bc669e 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -22,6 +22,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/hw/xfree86/os-support/bus/altixPCI.c b/hw/xfree86/os-support/bus/altixPCI.c
index c2c21d39f..010f6619a 100644
--- a/hw/xfree86/os-support/bus/altixPCI.c
+++ b/hw/xfree86/os-support/bus/altixPCI.c
@@ -1,6 +1,10 @@
/*
* This file contains the glue necessary for support of SGI's Altix chipset.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <stdio.h>
#include <unistd.h>
#include "altixPCI.h"
diff --git a/hw/xfree86/os-support/bus/altixPCI.h b/hw/xfree86/os-support/bus/altixPCI.h
index 1d449d55b..2a738f362 100644
--- a/hw/xfree86/os-support/bus/altixPCI.h
+++ b/hw/xfree86/os-support/bus/altixPCI.h
@@ -1,3 +1,7 @@
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#ifndef PCI_ALTIX_H
#define PCI_ALTIX_H 1
diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c
index 04ff8b956..08c7fbd39 100644
--- a/hw/xfree86/os-support/bus/axpPci.c
+++ b/hw/xfree86/os-support/bus/axpPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */
/*
* Copyright 1998 by Concurrent Computer Corporation
*
@@ -45,6 +45,10 @@
* SOFTWARE.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <stdio.h>
#include "compiler.h"
#include "xf86.h"
diff --git a/hw/xfree86/os-support/bus/e8870PCI.c b/hw/xfree86/os-support/bus/e8870PCI.c
index 9eb34a67a..65b0c0474 100644
--- a/hw/xfree86/os-support/bus/e8870PCI.c
+++ b/hw/xfree86/os-support/bus/e8870PCI.c
@@ -29,6 +29,10 @@
* This file contains the glue necessary for support of Intel's E8870 chipset.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include "e8870PCI.h"
#include "xf86.h"
#include "Pci.h"
diff --git a/hw/xfree86/os-support/bus/e8870PCI.h b/hw/xfree86/os-support/bus/e8870PCI.h
index 2d16077ac..9efa0ed6d 100644
--- a/hw/xfree86/os-support/bus/e8870PCI.h
+++ b/hw/xfree86/os-support/bus/e8870PCI.h
@@ -25,6 +25,10 @@
* XFree86 Project.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#ifndef PCI_E8870_H
#define PCI_E8870_H 1
diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c
index c3e621daf..f6d6f8a6d 100644
--- a/hw/xfree86/os-support/bus/freebsdPci.c
+++ b/hw/xfree86/os-support/bus/freebsdPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.5 2002/08/27 22:07:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */
/*
* Copyright 1998 by Concurrent Computer Corporation
*
@@ -45,6 +45,10 @@
* SOFTWARE.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <stdio.h>
#include "compiler.h"
#include "xf86.h"
@@ -84,7 +88,7 @@ static pciBusInfo_t freebsdPci0 = {
/* bridge */ NULL
};
-#if !defined(__OpenBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
#if X_BYTE_ORDER == X_BIG_ENDIAN
#ifdef __sparc__
#ifndef ASI_PL
diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c
index 99e3ba245..6e2b650d1 100644
--- a/hw/xfree86/os-support/bus/ix86Pci.c
+++ b/hw/xfree86/os-support/bus/ix86Pci.c
@@ -136,6 +136,10 @@
* authorization from the copyright holder(s) and author(s).
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <stdio.h>
#include "compiler.h"
#include "xf86.h"
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 32e11e4eb..2a21aa3ea 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -45,6 +45,10 @@
* SOFTWARE.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <stdio.h>
#include "compiler.h"
#include "xf86.h"
diff --git a/hw/xfree86/os-support/bus/netbsdPci.c b/hw/xfree86/os-support/bus/netbsdPci.c
index 9c46ee3d3..7dbbfdec7 100644
--- a/hw/xfree86/os-support/bus/netbsdPci.c
+++ b/hw/xfree86/os-support/bus/netbsdPci.c
@@ -27,6 +27,10 @@
* authorization from the XFree86 Project.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c
index 1be10ab9b..7a438af67 100644
--- a/hw/xfree86/os-support/bus/ppcPci.c
+++ b/hw/xfree86/os-support/bus/ppcPci.c
@@ -58,6 +58,10 @@
* SOFTWARE.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include <stdio.h>
#include "compiler.h"
#include "xf86.h"
diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c
index 2ada6fd47..48e10ede4 100644
--- a/hw/xfree86/os-support/bus/sparcPci.c
+++ b/hw/xfree86/os-support/bus/sparcPci.c
@@ -25,6 +25,10 @@
* XFree86 Project.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index d1284dc44..f0ab4307a 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -102,6 +102,10 @@
* Drivers should use this file rather than Pci.h.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#ifndef _XF86PCI_H
#define _XF86PCI_H 1
#include <X11/Xarch.h>
diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h
index 1ff4432b4..21b05cba4 100644
--- a/hw/xfree86/os-support/bus/xf86Sbus.h
+++ b/hw/xfree86/os-support/bus/xf86Sbus.h
@@ -22,6 +22,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#ifndef _XF86_SBUS_H
#define _XF86_SBUS_H
diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c
index 16f1b40a5..3d219c86f 100644
--- a/hw/xfree86/os-support/bus/zx1PCI.c
+++ b/hw/xfree86/os-support/bus/zx1PCI.c
@@ -31,6 +31,10 @@
* architectures.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#include "zx1PCI.h"
#include "xf86.h"
#include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/bus/zx1PCI.h b/hw/xfree86/os-support/bus/zx1PCI.h
index f46a68a30..2795b4459 100644
--- a/hw/xfree86/os-support/bus/zx1PCI.h
+++ b/hw/xfree86/os-support/bus/zx1PCI.h
@@ -25,6 +25,10 @@
* XFree86 Project.
*/
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
#ifndef PCI_ZX1_H
#define PCI_ZX1_H 1
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 16:06:46 +0000