[PATCH xf86-video-chips] Build fixes for ABI_VIDEODRV_VERSION 12

Jeremy Huddleston jeremyhu at apple.com
Sat Sep 24 00:03:45 PDT 2011


1) Include <pciaccess.h> for IOADDRESS
2) Use CARD32 instead of PCITAG

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---

These were the necessary changes to build xf86-video-chips with the pending bus changes.  If people are ok with this, I'll push these changes to xf86-video-chips and similar changes to other drivers.  If any other driver is more extensive than this, I'll send a separate review for it.

 src/ct_driver.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/ct_driver.h b/src/ct_driver.h
index 10a24d4..06c8aa8 100644
--- a/src/ct_driver.h
+++ b/src/ct_driver.h
@@ -26,6 +26,7 @@
 #ifndef _CT_DRIVER_H_
 #define _CT_DRIVER_H_
 
+#include <pciaccess.h>
 #include "ct_pcirename.h"
 #include "xaa.h"
 #include "vbe.h"
@@ -271,7 +272,11 @@ typedef struct {
 
 typedef struct _CHIPSRec {
     pciVideoPtr		PciInfo;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
     PCITAG		PciTag;
+#else
+    CARD32		PciTag;
+#endif
     int			Chipset;
     EntityInfoPtr       pEnt;
     IOADDRESS		PIOBase;
-- 
1.7.4.1




More information about the xorg-devel mailing list