diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-31 11:57:49 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-31 11:59:20 -0700 |
| commit | 2b459f385dc2f1b5e769e2ce84b6f4ec099c0a23 (patch) | |
| tree | 1239e95cad0440076d4a1ebc5399492ed9d9533e | |
| parent | 0ab07a477a4916923a13c073c3fd6e575e79f725 (diff) | |
Build fix for older servers (error: conflicting types for 'pciTag')
/usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here
Reported-by: Johannes Obermayr <johannesobermayr@gmx.de>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/sispcirename.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/sispcirename.h b/src/sispcirename.h index 54cc07f..a354ac4 100644 --- a/src/sispcirename.h +++ b/src/sispcirename.h @@ -36,6 +36,10 @@ enum region_type { REGION_IO }; +#include "xf86Module.h" + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 + #if (defined(__alpha__) || defined(__ia64__)) && defined (linux) #define PCI_DOM_MASK 0x01fful #else @@ -57,6 +61,7 @@ pciTag(int busnum, int devnum, int funcnum) return tag; } +#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */ #ifndef XSERVER_LIBPCIACCESS |