diff options
| author | Julien Cristau <jcristau@debian.org> | 2009-05-14 17:01:57 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2009-05-14 17:03:11 +0200 |
| commit | 4cc33190ef1a4207c0f8fc74201cdf2568a239c2 (patch) | |
| tree | 2314bff5fbcd99ff146912c911af025de454795e | |
| parent | ed9aecf8517bf74e943e3e5dd3ee407524e8f122 (diff) | |
xfree86: Add two __FreeBSD_kernel__ checks
Debian bug#525475 <http://bugs.debian.org/525475>
Reported-by: Petr Salinger <Petr.Salinger@seznam.cz>
Signed-off-by: Julien Cristau <jcristau@debian.org>
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/os-support/shared/stdResource.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 7623e9738..79b38f015 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 a4c162d97..9db349bc0 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 |