diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-30 20:34:47 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-31 11:55:47 -0700 |
| commit | d9c9cc333e8a67749c20b3b30129f4d2297a3e0a (patch) | |
| tree | bd4aa2743fd54aa0219d9e9da795aa08a2e99188 /src/cir_pcirename.h | |
| parent | 05fd00f46eb3be46d669921d11dff6fe8a5bb60b (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>
Diffstat (limited to 'src/cir_pcirename.h')
| -rw-r--r-- | src/cir_pcirename.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h index fa60a19..669b8fe 100644 --- a/src/cir_pcirename.h +++ b/src/cir_pcirename.h @@ -34,6 +34,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 @@ -55,6 +59,7 @@ pciTag(int busnum, int devnum, int funcnum) return tag; } +#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */ #ifndef XSERVER_LIBPCIACCESS |