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 /dix/main.c | |
| 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 'dix/main.c')
| -rw-r--r-- | dix/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dix/main.c b/dix/main.c index 3c2d1634e..c3e578ef1 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.4 2003/12/18 19:29:12 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */ /*********************************************************** @@ -94,7 +94,7 @@ SOFTWARE. #include "dixfont.h" #include "extnsionst.h" #ifdef XINERAMA -extern Bool noXineramaExtension; +extern Bool noPanoramiXExtension; #else #include "dixevents.h" /* InitEvents() */ #include "dispatch.h" /* InitProcVectors() */ @@ -407,8 +407,8 @@ main(int argc, char *argv[], char *envp[]) /* * Consolidate window and colourmap information for each screen */ - if (!noXineramaExtension) - XineramaConsolidate(); + if (!noPanoramiXExtension) + PanoramiXConsolidate(); #endif for (i = 0; i < screenInfo.numScreens; i++) @@ -420,8 +420,8 @@ main(int argc, char *argv[], char *envp[]) #endif #ifdef XINERAMA - if (!noXineramaExtension) { - if (!XineramaCreateConnectionBlock()) + if (!noPanoramiXExtension) { + if (!PanoramiXCreateConnectionBlock()) FatalError("could not create connection block info"); } else #endif @@ -440,10 +440,10 @@ main(int argc, char *argv[], char *envp[]) #ifdef XINERAMA { - Bool remember_it = noXineramaExtension; - noXineramaExtension = TRUE; + Bool remember_it = noPanoramiXExtension; + noPanoramiXExtension = TRUE; FreeAllResources(); - noXineramaExtension = remember_it; + noPanoramiXExtension = remember_it; } #else FreeAllResources(); |