diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-02 21:09:13 +0000 |
| commit | 8fedf58693f42869528b41408ac4d6012839e973 (patch) | |
| tree | 62a817bea7dfc71050292d302ba94f5e349c67a7 /xorg-server/include/resource.h | |
| parent | ac14083f465166b298162a57fff0bad90e528fff (diff) | |
| parent | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff) | |
| download | vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2 vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/resource.h')
| -rw-r--r-- | xorg-server/include/resource.h | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h index b8105d45a..9b5792e30 100644 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h @@ -218,13 +218,20 @@ extern pointer LookupClientResourceComplex( FindComplexResType func, pointer cdata); -extern int dixLookupResource( +extern int dixLookupResourceByType( pointer *result, XID id, RESTYPE rtype, ClientPtr client, Mask access_mode); +extern int dixLookupResourceByClass( + pointer *result, + XID id, + RESTYPE rclass, + ClientPtr client, + Mask access_mode); + extern void GetXIDRange( int /*client*/, Bool /*server*/, @@ -244,29 +251,42 @@ extern RESTYPE TypeMask; * Please use the noted replacements instead. */ -/* replaced by dixLookupResource */ +#ifdef __GNUC__ +#define X_DEPRECATED __attribute__((deprecated)) +#else +#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; + extern pointer SecurityLookupIDByType( ClientPtr client, XID id, RESTYPE rtype, - Mask access_mode); + Mask access_mode) X_DEPRECATED; -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByClass */ extern pointer SecurityLookupIDByClass( ClientPtr client, XID id, RESTYPE classes, - Mask access_mode); + Mask access_mode) X_DEPRECATED; -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByType */ extern pointer LookupIDByType( XID id, - RESTYPE rtype); + RESTYPE rtype) X_DEPRECATED; -/* replaced by dixLookupResource */ +/* replaced by dixLookupResourceByClass */ extern pointer LookupIDByClass( XID id, - RESTYPE classes); + RESTYPE classes) X_DEPRECATED; #endif /* RESOURCE_H */ |