diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-27 11:49:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-27 11:49:20 +0000 |
| commit | f331b3c351021681044b2594d1ec5b49bd8edb47 (patch) | |
| tree | 3f593072cd3390f173857a4d0484938aed8863c1 /xorg-server/hw/xfree86/modes/xf86Modes.c | |
| parent | 4e512860d6f0a7644ae3872d91edafa9040f608a (diff) | |
| parent | 84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (diff) | |
| download | vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.gz vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.tar.bz2 vcxsrv-f331b3c351021681044b2594d1ec5b49bd8edb47.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/modes/xf86Modes.c')
| -rw-r--r-- | xorg-server/hw/xfree86/modes/xf86Modes.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/xorg-server/hw/xfree86/modes/xf86Modes.c b/xorg-server/hw/xfree86/modes/xf86Modes.c index 0507e9812..6b34ec11c 100644 --- a/xorg-server/hw/xfree86/modes/xf86Modes.c +++ b/xorg-server/hw/xfree86/modes/xf86Modes.c @@ -38,14 +38,6 @@ extern XF86ConfigPtr xf86configptr;
-/*
- * This is the version number where we epoched. These files get copied
- * into drivers that want to use this setup infrastructure on pre-1.3
- * servers, so when that happens they need to define these symbols
- * themselves. However, _in_ the server, we basically always define them now.
- */
-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)
-
/**
* Calculates the horizontal sync rate of a mode.
*/
@@ -326,7 +318,6 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode) mode->VTotal, flags, xf86ModeHSync(mode));
free(flags);
}
-#endif /* XORG_VERSION_CURRENT <= 7.2.99.2 */
/**
* Marks as bad any modes with unsupported flags.
@@ -503,12 +494,7 @@ xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList, for (mode = modeList; mode != NULL; mode = mode->next) {
if (xf86ModeBandwidth(mode, depth) > bandwidth)
-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
mode->status = MODE_BANDWIDTH;
-#else
- /* MODE_BANDWIDTH didn't exist in xserver 1.2 */
- mode->status = MODE_BAD;
-#endif
}
}
|