diff options
author | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
commit | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch) | |
tree | d08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/include/resource.h | |
parent | aaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff) | |
download | vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2 vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip |
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/include/resource.h')
-rw-r--r-- | xorg-server/include/resource.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h index 4a8dc3169..db44aefad 100644 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h @@ -133,24 +133,24 @@ typedef struct { ResourceState state; XID id; RESTYPE type; - pointer value; + void *value; } ResourceStateInfoRec; -typedef int (*DeleteType) (pointer /*value */ , +typedef int (*DeleteType) (void */*value */ , XID /*id */ ); -typedef void (*FindResType) (pointer /*value */ , +typedef void (*FindResType) (void */*value */ , XID /*id */ , - pointer /*cdata */ ); + void */*cdata */ ); -typedef void (*FindAllRes) (pointer /*value */ , +typedef void (*FindAllRes) (void */*value */ , XID /*id */ , RESTYPE /*type */ , - pointer /*cdata */ ); + void */*cdata */ ); -typedef Bool (*FindComplexResType) (pointer /*value */ , +typedef Bool (*FindComplexResType) (void */*value */ , XID /*id */ , - pointer /*cdata */ ); + void */*cdata */ ); /* Structure for estimating resource memory usage. Memory usage * consists of space allocated for the resource itself and of @@ -166,16 +166,16 @@ typedef struct { unsigned long refCnt; } ResourceSizeRec, *ResourceSizePtr; -typedef void (*SizeType)(pointer /*value*/, +typedef void (*SizeType)(void */*value*/, XID /*id*/, ResourceSizePtr /*size*/); extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType /*deleteFunc */ , const char * /*name */ ); -typedef void (*FindTypeSubResources)(pointer /* value */, +typedef void (*FindTypeSubResources)(void */* value */, FindAllRes /* func */, - pointer /* cdata */); + void */* cdata */); extern _X_EXPORT SizeType GetResourceTypeSizeFunc( RESTYPE /*type*/); @@ -202,7 +202,7 @@ extern _X_EXPORT XID FakeClientID(int /*client */ ); #endif extern _X_EXPORT Bool AddResource(XID /*id */ , RESTYPE /*type */ , - pointer /*value */ ); + void */*value */ ); extern _X_EXPORT void FreeResource(XID /*id */ , RESTYPE /*skipDeleteFuncType */ ); @@ -213,25 +213,25 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ , extern _X_EXPORT Bool ChangeResourceValue(XID /*id */ , RESTYPE /*rtype */ , - pointer /*value */ ); + void */*value */ ); extern _X_EXPORT void FindClientResourcesByType(ClientPtr /*client */ , RESTYPE /*type */ , FindResType /*func */ , - pointer /*cdata */ ); + void */*cdata */ ); extern _X_EXPORT void FindAllClientResources(ClientPtr /*client */ , FindAllRes /*func */ , - pointer /*cdata */ ); + void */*cdata */ ); /** @brief Iterate through all subresources of a resource. @note The XID argument provided to the FindAllRes function may be 0 for subresources that don't have an XID */ -extern _X_EXPORT void FindSubResources(pointer /*resource*/, +extern _X_EXPORT void FindSubResources(void */*resource*/, RESTYPE /*type*/, FindAllRes /*func*/, - pointer /*cdata*/); + void */*cdata*/); extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ ); @@ -242,18 +242,18 @@ extern _X_EXPORT void FreeAllResources(void); extern _X_EXPORT Bool LegalNewID(XID /*id */ , ClientPtr /*client */ ); -extern _X_EXPORT pointer LookupClientResourceComplex(ClientPtr client, +extern _X_EXPORT void *LookupClientResourceComplex(ClientPtr client, RESTYPE type, FindComplexResType func, - pointer cdata); + void *cdata); -extern _X_EXPORT int dixLookupResourceByType(pointer *result, +extern _X_EXPORT int dixLookupResourceByType(void **result, XID id, RESTYPE rtype, ClientPtr client, Mask access_mode); -extern _X_EXPORT int dixLookupResourceByClass(pointer *result, +extern _X_EXPORT int dixLookupResourceByClass(void **result, XID id, RESTYPE rclass, ClientPtr client, |