summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Mode.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-25 21:47:10 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-25 21:47:10 +0000
commitb052486adb9ea26f37be120966eb60cd3ac3db2f (patch)
tree916d84606a03b7caefbe86bfa9dc642a7092da72 /hw/xfree86/common/xf86Mode.c
parent14ab4ade74e946c09d633b15ab4d447d7b69ea29 (diff)
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it hasXORG-RELEASE-1-BASEXEVIE-MERGE
been decided that the priority is to preserve the server's internal API/ABI so that third-party drivers that depend on symbols like noPanoramiXExtension, etc., would not need to be recompiled. Too bad gcc on Linux doesn't support ELF's weak symbols as that would have been a reasonable solution for preserving the ABI. N.B.: While symbols, i.e. functions and variables revert to the old name, I did not revert build names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and it's just a build issue that has no impact on the binary output of the build.
Diffstat (limited to 'hw/xfree86/common/xf86Mode.c')
-rw-r--r--hw/xfree86/common/xf86Mode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 392229ce9..ab428e0b0 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -1683,7 +1683,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
#ifdef RANDR
if (!xf86Info.disableRandR
#ifdef XINERAMA
- && noXineramaExtension
+ && noPanoramiXExtension
#endif
)
validateAllDefaultModes = TRUE;