aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/resource.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
commitedce25213ffc81389909c827c9aaac27b736b483 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/include/resource.h
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
parent68dd0b52e13c844d662192654fb10cb993257a59 (diff)
downloadnx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/include/resource.h')
-rw-r--r--nx-X11/programs/Xserver/include/resource.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h
index 49c189869..3aac8bb00 100644
--- a/nx-X11/programs/Xserver/include/resource.h
+++ b/nx-X11/programs/Xserver/include/resource.h
@@ -123,24 +123,24 @@ typedef unsigned long RESTYPE;
#define BAD_RESOURCE 0xe0000000
typedef int (*DeleteType)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/);
typedef void (*FindResType)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
typedef void (*FindAllRes)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/,
RESTYPE /*type*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
typedef Bool (*FindComplexResType)(
- pointer /*value*/,
+ void * /*value*/,
XID /*id*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
extern RESTYPE CreateNewResourceType(
DeleteType /*deleteFunc*/);
@@ -161,7 +161,7 @@ extern XID FakeClientID(
extern Bool AddResource(
XID /*id*/,
RESTYPE /*type*/,
- pointer /*value*/);
+ void * /*value*/);
extern void FreeResource(
XID /*id*/,
@@ -175,18 +175,18 @@ extern void FreeResourceByType(
extern Bool ChangeResourceValue(
XID /*id*/,
RESTYPE /*rtype*/,
- pointer /*value*/);
+ void * /*value*/);
extern void FindClientResourcesByType(
ClientPtr /*client*/,
RESTYPE /*type*/,
FindResType /*func*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
extern void FindAllClientResources(
ClientPtr /*client*/,
FindAllRes /*func*/,
- pointer /*cdata*/);
+ void * /*cdata*/);
extern void FreeClientNeverRetainResources(
ClientPtr /*client*/);
@@ -200,19 +200,19 @@ extern Bool LegalNewID(
XID /*id*/,
ClientPtr /*client*/);
-extern pointer LookupIDByType(
+extern void * LookupIDByType(
XID /*id*/,
RESTYPE /*rtype*/);
-extern pointer LookupIDByClass(
+extern void * LookupIDByClass(
XID /*id*/,
RESTYPE /*classes*/);
-extern pointer LookupClientResourceComplex(
+extern void * LookupClientResourceComplex(
ClientPtr client,
RESTYPE type,
FindComplexResType func,
- pointer cdata);
+ void * cdata);
/* These are the access modes that can be passed in the last parameter
* to SecurityLookupIDByType/Class. The Security extension doesn't
@@ -229,13 +229,13 @@ extern pointer LookupClientResourceComplex(
#ifdef XCSECURITY
-extern pointer SecurityLookupIDByType(
+extern void * SecurityLookupIDByType(
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*rtype*/,
Mask /*access_mode*/);
-extern pointer SecurityLookupIDByClass(
+extern void * SecurityLookupIDByClass(
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*classes*/,