summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin Brace <kevinbrace@gmx.com>2020-03-11 10:02:12 -0700
committerKevin Brace <kevinbrace@gmx.com>2020-03-11 10:02:12 -0700
commita1bfe904198a6ff8874f9e13e8980a02119db18d (patch)
treef711862d52ff41672c1fa2daa865133d1d8925d0 /src
parent6d58bec97f2f7a660cea389250524d645c64e666 (diff)
Redo ClockRange / ClockRanges compilation fix
Use the actual X.Org X Server version for determining whether or not ClockRange or ClockRanges should be used. This commit is effectively redoing commit 8bc53d8 (Compilation hooks to support ClockRange and ClockRanges). This commit and commit 8bc53d8 are ultimately related to X Server commit 326429b (modes: Remove the ClockRanges type). Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'src')
-rw-r--r--src/via_ums.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/via_ums.c b/src/via_ums.c
index 4047500..00fd0d6 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1194,7 +1194,7 @@ viaUMSCrtcInit(ScrnInfoPtr pScrn)
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
VIARegPtr Regs = &pVIADisplay->SavedReg;
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,8,0,0,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,3,0)
ClockRangePtr clockRanges;
#else
ClockRangesPtr clockRanges;
@@ -1398,7 +1398,7 @@ viaUMSCrtcInit(ScrnInfoPtr pScrn)
* available, and what sort of modes they can be used for.
*/
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,8,0,0,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,3,0)
clockRanges = xnfalloc(sizeof(ClockRange));
#else
clockRanges = xnfalloc(sizeof(ClockRanges));