diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-24 10:10:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-24 10:10:29 +0000 |
| commit | 84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (patch) | |
| tree | a6a1cf67169f65d2b680c6d3f548d45901284aff /xorg-server/hw/xfree86/modes/xf86EdidModes.c | |
| parent | 6a14682c40a85bbfdb5023a3330e95a3a3c0ad03 (diff) | |
| download | vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.gz vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.bz2 vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.zip | |
xserver xkbcomp libxcb pixman git update 24/9/2010
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86EdidModes.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86EdidModes.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86EdidModes.c b/xorg-server/hw/xfree86/modes/xf86EdidModes.c index fc469c6ba..ecc1b110d 100644 --- a/xorg-server/hw/xfree86/modes/xf86EdidModes.c +++ b/xorg-server/hw/xfree86/modes/xf86EdidModes.c @@ -636,7 +636,6 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing, return Mode;
}
-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
static DisplayModePtr
DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)
{
@@ -665,7 +664,6 @@ DDCModesFromCVT(int scrnIndex, struct cvt_timings *t) return modes;
}
-#endif
static const struct {
short w;
@@ -1021,12 +1019,10 @@ static void handle_detailed_modes(struct detailed_monitor_section *det_mon, p->quirks, p->timing_level,p->rb);
p->Modes = xf86ModesAdd(p->Modes, Mode);
break;
-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
case DS_CVT:
Mode = DDCModesFromCVT(p->DDC->scrnIndex, det_mon->section.cvt);
p->Modes = xf86ModesAdd(p->Modes, Mode);
break;
-#endif
case DS_EST_III:
Mode = DDCModesFromEstIII(det_mon->section.est_iii);
p->Modes = xf86ModesAdd(p->Modes, Mode);
|