From 27d17afba2c21f490ea8472d7aa37495e02e3ed8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 18 Sep 2003 03:20:45 +0000 Subject: Followup commit: Unbreak XFree86-4-Server-snap on -stable -- gcc 2 has no -Wno-system-headers. While I'm here, port patches for non-x86/alpha from XFree86-4-Server. Reported by: Adam Weinberger Marius Strobl --- .../XFree86-4-Server-snap/files/patch-Pci.h | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'x11-servers/XFree86-4-Server-snap/files/patch-Pci.h') diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h index e69de29bb2d1..3f0842e170a4 100644 --- a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h +++ b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h @@ -0,0 +1,34 @@ +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Wed Sep 10 04:05:17 2003 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Wed Sep 17 19:10:42 2003 +@@ -255,6 +255,10 @@ + # define ARCH_PCI_INIT linuxPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN ++# elif defined(FreeBSD) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN + # endif + # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper + #elif defined(__i386__) +@@ -315,14 +319,18 @@ + # elif defined(sun) + # define ARCH_PCI_INIT sparcPciInit + # define INCLUDE_XF86_MAP_PCI_MEM +-# elif defined(__OpenBSD__) && defined(__sparc64__) ++# elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__) + # define ARCH_PCI_INIT freebsdPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN + # endif + # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge + #elif defined(__AMD64__) +-# define ARCH_PCI_INIT ix86PciInit ++# if defined(__FreeBSD__) ++# define ARCH_PCI_INIT freebsdPciInit ++# else ++# define ARCH_PCI_INIT ix86PciInit ++# endif + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN + # if defined(linux) -- cgit v1.2.3