blob: cb9fd7ea5d12cfaa86f0807a3b5076560f66a27f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From 8c3eca873717e877048c2bde345c02b1e9099e50 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 28 Jul 2009 05:22:41 +0000
Subject: sis: change to using ABI version check
---
diff --git a/src/sis.h b/src/sis.h
index e859c78..400b83f 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -77,7 +77,7 @@
#include "xf86Pci.h"
#include "xf86Priv.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
#include "xf86.h"
diff --git a/src/sis_driver.c b/src/sis_driver.c
index bb11cbb..994b02d 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -49,7 +49,7 @@
#include "sis.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#endif
#include "dixstruct.h"
--
cgit v0.8.3-6-g21f6
|
