xserver: Branch 'master'

[Peter Hutterer]

 dix/deprecated.c   |   18 ------------------
 include/resource.h |    8 --------
 2 files changed, 26 deletions(-)

New commits:
commit 9005ec4ce19d704d5055232d2a36acee3247be67
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Sep 4 11:38:03 2009 +1000

    dix: remove dixLookupResource - we don't have any users left.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked-by: Eamon Walsh <ewalsh at tycho.nsa.gov>
    Acked-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/dix/deprecated.c b/dix/deprecated.c
index 8123886..21d0f57 100644
--- a/dix/deprecated.c
+++ b/dix/deprecated.c
@@ -162,22 +162,4 @@ LookupIDByClass(XID id, RESTYPE classes)
     return val;
 }
 
-/* replaced by dixLookupResourceBy{Type,Class} */
-_X_EXPORT int
-dixLookupResource (pointer *result, XID id, RESTYPE rtype,
-		   ClientPtr client, Mask mode)
-{
-    Bool istype = ((rtype & TypeMask) && (rtype != RC_ANY)) || (rtype == RT_NONE);
-
-    static int warn = 1;
-    if (warn > 0 && --warn)
-	ErrorF("Warning: dixLookupResource() "
-	       "is deprecated.  Please convert your driver/module "
-	       "to use dixLookupResourceByType/dixLookupResourceByClass().\n");
-    if (istype)
-	return dixLookupResourceByType (result, id, rtype, client, mode);
-    else
-	return dixLookupResourceByClass (result, id, rtype, client, mode);
-}
-
 /* end deprecated functions */
diff --git a/include/resource.h b/include/resource.h
index 774f81b..8ed4e56 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -257,14 +257,6 @@ extern _X_EXPORT RESTYPE TypeMask;
 #define X_DEPRECATED
 #endif
 
-/* replaced by dixLookupResourceByType or dixLookupResourceByClass */
-extern int dixLookupResource(
-    pointer *result,
-    XID id,
-    RESTYPE rtype,
-    ClientPtr client,
-    Mask access_mode) X_DEPRECATED;
-
 /* replaced by dixLookupResourceByType */
 extern _X_EXPORT pointer SecurityLookupIDByType(
     ClientPtr client,