aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext/xres.c
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/Xext/xres.c
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/Xext/xres.c')
-rw-r--r--nx-X11/programs/Xserver/Xext/xres.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index d13d3368b..dc4018dd7 100644
--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/nx-X11/programs/Xserver/Xext/xres.c
@@ -106,7 +106,7 @@ ProcXResQueryClients (ClientPtr client)
static void
-ResFindAllRes (pointer value, XID id, RESTYPE type, pointer cdata)
+ResFindAllRes (void * value, XID id, RESTYPE type, void * cdata)
{
int *counts = (int *)cdata;
@@ -186,7 +186,7 @@ ProcXResQueryClientResources (ClientPtr client)
}
static void
-ResFindPixmaps (pointer value, XID id, pointer cdata)
+ResFindPixmaps (void * value, XID id, void * cdata)
{
unsigned long *bytes = (unsigned long *)cdata;
PixmapPtr pix = (PixmapPtr)value;
@@ -216,7 +216,7 @@ ProcXResQueryClientPixmapBytes (ClientPtr client)
bytes = 0;
FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps,
- (pointer)(&bytes));
+ (void *)(&bytes));
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;