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 /mi/miinitext.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 'mi/miinitext.c')
| -rw-r--r-- | mi/miinitext.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index bc2dee641..764ec7901 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */ /*********************************************************** @@ -63,7 +63,7 @@ SOFTWARE. #endif #ifdef XINERAMA -extern Bool noXineramaExtension; +extern Bool noPanoramiXExtension; #endif extern Bool noTestExtensions; #ifdef XKB @@ -104,7 +104,7 @@ typedef void (*InitExtension)(INITARGS); #include "securstr.h" #endif #ifdef XINERAMA -#include "xineramaProto.h" +#include "panoramiXproto.h" #endif #ifdef XF86BIGFONT #include "xf86bigfstr.h" @@ -136,7 +136,7 @@ extern void PexExtensionInit(INITARGS); extern void MultibufferExtensionInit(INITARGS); #endif #ifdef XINERAMA -extern void XineramaExtensionInit(INITARGS); +extern void PanoramiXExtensionInit(INITARGS); #endif #ifdef XINPUT extern void XInputExtensionInit(INITARGS); @@ -249,7 +249,7 @@ InitExtensions(argc, argv) { #ifdef XINERAMA # if !defined(PRINT_ONLY_SERVER) && !defined(NO_XINERAMA) - if (!noXineramaExtension) XineramaExtensionInit(); + if (!noPanoramiXExtension) PanoramiXExtensionInit(); # endif #endif #ifdef BEZIER @@ -438,7 +438,7 @@ ExtensionModule extension[] = { NULL, "TOG-CUP", NULL, NULL }, { NULL, "Extended-Visual-Information", NULL, NULL }, #ifdef XINERAMA - { NULL, "XINERAMA", &noXineramaExtension, NULL }, + { NULL, "XINERAMA", &noPanoramiXExtension, NULL }, #else { NULL, "NOXINERAMA", NULL, NULL }, #endif @@ -489,7 +489,7 @@ static ExtensionModule staticExtensions[] = { { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, #endif #ifdef XINERAMA - { XineramaExtensionInit, XINERAMA_PROTOCOL_NAME, &noXineramaExtension, NULL, NULL }, + { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL }, #endif #ifdef XF86BIGFONT { XFree86BigfontExtensionInit, XF86BIGFONTNAME, NULL, NULL, NULL }, |