Merged changes from RELEASE-1 branch

dix/resource.c

@@ -44,6 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* The panoramix components contained the following notice */
 /*****************************************************************
 
 Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -71,9 +72,9 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 
 ******************************************************************/
+
 /* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
-
-
+/* $XdotOrg$ */
 /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
 
 /*	Routines to manage various kinds of resources:
@@ -114,7 +115,7 @@ Equipment Corporation.
 #include "dixevents.h"
 #include "dixgrabs.h"
 #include "cursor.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -698,7 +699,7 @@ FindAllClientResources(
     }
 }
 
-#ifndef NO_XINERAMA_PORT
+
 pointer
 LookupClientResourceComplex(
     ClientPtr client,
@@ -724,7 +725,7 @@ LookupClientResourceComplex(
     }
     return NULL;
 }
-#endif /* NO_XINERAMA_PORT */
+
 
 void
 FreeClientNeverRetainResources(ClientPtr client)
@@ -823,7 +824,7 @@ LegalNewID(id, client)
     register ClientPtr client;
 {
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
     XID 	minid, maxid;
 
 	if (!noPanoramiXExtension) { 
@@ -833,7 +834,7 @@ LegalNewID(id, client)
             if ((id >= minid) && (id <= maxid))
 	        return TRUE;
 	}
-#endif /* XINERAMA */
+#endif /* PANORAMIX */
 	return ((client->clientAsMask == (id & ~RESOURCE_ID_MASK)) &&
 	    ((clientTable[client->index].expectID <= id) ||
 	     !LookupIDByClass(id, RC_ANY)));