xserver: Branch 'master'
Julien Cristau
jcristau at kemper.freedesktop.org
Thu May 14 08:05:13 PDT 2009
hw/xfree86/os-support/bus/Pci.h | 3 ++-
hw/xfree86/os-support/shared/stdResource.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 4cc33190ef1a4207c0f8fc74201cdf2568a239c2
Author: Julien Cristau <jcristau at debian.org>
Date: Thu May 14 17:01:57 2009 +0200
xfree86: Add two __FreeBSD_kernel__ checks
Debian bug#525475 <http://bugs.debian.org/525475>
Reported-by: Petr Salinger <Petr.Salinger at seznam.cz>
Signed-off-by: Julien Cristau <jcristau at debian.org>
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 7623e97..79b38f0 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -168,7 +168,8 @@
#endif /* !defined(DEBUGPCI) */
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
+ defined(__OpenBSD__) || defined(__NetBSD__) || \
defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
#define ARCH_PCI_INIT bsdPciInit
#endif
diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c
index a4c162d..9db349b 100644
--- a/hw/xfree86/os-support/shared/stdResource.c
+++ b/hw/xfree86/os-support/shared/stdResource.c
@@ -43,7 +43,8 @@
/* Avoid Imakefile changes */
#include "bus/Pci.h"
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
+ defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
#define xf86StdAccResFromOS xf86AccResFromOS
#endif
More information about the xorg-commit
mailing list