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.

1 files changed, 8 insertions, 8 deletions

diff --git a/os/utils.c b/os/utils.c
index d0bd334fa..2f7ad4944 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.4 2003/12/18 19:29:15 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.5 2004/02/23 21:37:27 kaleb Exp $ */
 /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
 /*
 
@@ -129,12 +129,12 @@ OR PERFORMANCE OF THIS SOFTWARE.
 Bool CoreDump;
 Bool noTestExtensions;
 
-Bool noXineramaExtension = TRUE;
+Bool noPanoramiXExtension = TRUE;
 #ifdef XINERAMA
-Bool XineramaVisibilityNotifySent = FALSE;
-Bool XineramaMapped = FALSE;
-Bool XineramaWindowExposureSent = FALSE;
-Bool XineramaOneExposeRequest = FALSE;
+Bool PanoramiXVisibilityNotifySent = FALSE;
+Bool PanoramiXMapped = FALSE;
+Bool PanoramiXWindowExposureSent = FALSE;
+Bool PanoramiXOneExposeRequest = FALSE;
 #endif
 
 int auditTrailLevel = 1;
@@ -886,10 +886,10 @@ ProcessCommandLine(int argc, char *argv[])
          }
 #ifdef XINERAMA
 	else if ( strcmp( argv[i], "+xinerama") == 0){
-	    noXineramaExtension = FALSE;
+	    noPanoramiXExtension = FALSE;
 	}
 	else if ( strcmp( argv[i], "-xinerama") == 0){
-	    noXineramaExtension = TRUE;
+	    noPanoramiXExtension = TRUE;
 	}
 #endif
 	else if ( strcmp( argv[i], "-x") == 0)