bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has

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.

dix/resource.c

@@ -1,4 +1,3 @@
-/* $XdotOrg$ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -90,8 +89,8 @@ SOFTWARE.
 #include "dixgrabs.h"
 #include "cursor.h"
 #ifdef XINERAMA
-#include "xinerama.h"
-#include "xineramaSrv.h"
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
 #endif
 #include <assert.h>
 
@@ -801,7 +800,7 @@ LegalNewID(id, client)
 #ifdef XINERAMA
     XID 	minid, maxid;
 
-	if (!noXineramaExtension) { 
+	if (!noPanoramiXExtension) { 
 	    minid = client->clientAsMask | (client->index ? 
 			                    SERVER_BIT : SERVER_MINID);
 	    maxid = (clientTable[client->index].fakeID | RESOURCE_ID_MASK) + 1;