summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dix/deprecated.c18
-rw-r--r--include/resource.h8
2 files changed, 0 insertions, 26 deletions
diff --git a/dix/deprecated.c b/dix/deprecated.c
index 8123886ca..21d0f574d 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 774f81b56..8ed4e569e 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,