xgi: change to using ABI version check

1 files changed, 11 insertions, 11 deletions

diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index c6b2dcb..950e69e 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -58,10 +58,10 @@
 #include "xf86.h"

 #include "xf86Priv.h"

 #include "xf86_OSproc.h"

-#ifndef XSERVER_LIBPCIACCESS

+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6

 #include "xf86Resources.h"

 #include "xf86RAC.h"

-#endif
+#endif

 #include "dixstruct.h"

 #include "xorgVersion.h"

 #include "xf86PciInfo.h"

@@ -87,13 +87,13 @@
 

 #include "globals.h"

 

-#ifdef HAVE_XEXTPROTO_71
-#include <X11/extensions/dpmsconst.h>
-#else
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
-#endif
-
+#ifdef HAVE_XEXTPROTO_71

+#include <X11/extensions/dpmsconst.h>

+#else

+#define DPMS_SERVER

+#include <X11/extensions/dpms.h>

+#endif

+

 

 #if defined(XvExtension)

 #include "xf86xv.h"

@@ -2462,7 +2462,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;

     /* Operations for which I/O access is required */

     pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;

-#endif
+#endif

 

     /* The ramdac module should be loaded here when needed */

     if (!xf86LoadSubModule(pScrn, "ramdac")) {

@@ -2949,7 +2949,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
         XGIFreeRec(pScrn);

         return FALSE;

     }

-#endif
+#endif

 

     from = X_PROBED;

     if (pXGI->pEnt->device->videoRam != 0) {