diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-25 21:47:10 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-25 21:47:10 +0000 |
| commit | b052486adb9ea26f37be120966eb60cd3ac3db2f (patch) | |
| tree | 916d84606a03b7caefbe86bfa9dc642a7092da72 /fb | |
| parent | 14ab4ade74e946c09d633b15ab4d447d7b69ea29 (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 'fb')
| -rw-r--r-- | fb/fbwindow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 9a582c5fc..25f2b4130 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * @@ -225,8 +225,8 @@ fbFillRegionSolid (DrawablePtr pDrawable, } #ifdef XINERAMA -#include "xinerama.h" -#include "xineramaSrv.h" +#include "panoramiX.h" +#include "panoramiXsrv.h" #endif void @@ -249,13 +249,13 @@ fbFillRegionTiled (DrawablePtr pDrawable, int yRot = pDrawable->y; #ifdef XINERAMA - if(!noXineramaExtension) + if(!noPanoramiXExtension) { int index = pDrawable->pScreen->myNum; if(&WindowTable[index]->drawable == pDrawable) { - xRot -= xineramaDataPtr[index].x; - yRot -= xineramaDataPtr[index].y; + xRot -= panoramiXdataPtr[index].x; + yRot -= panoramiXdataPtr[index].y; } } #endif |