aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/composite/compext.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/composite/compext.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/composite/compext.c')
-rw-r--r--nx-X11/programs/Xserver/composite/compext.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/composite/compext.c b/nx-X11/programs/Xserver/composite/compext.c
index 657ed9bdc..d182da1fd 100644
--- a/nx-X11/programs/Xserver/composite/compext.c
+++ b/nx-X11/programs/Xserver/composite/compext.c
@@ -42,8 +42,8 @@ typedef struct _CompositeClient {
static void
CompositeClientCallback (CallbackListPtr *list,
- pointer closure,
- pointer data)
+ void *closure,
+ void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -59,7 +59,7 @@ CompositeResetProc (ExtensionEntry *extEntry)
}
static int
-FreeCompositeClientWindow (pointer value, XID ccwid)
+FreeCompositeClientWindow (void * value, XID ccwid)
{
WindowPtr pWin = value;
@@ -68,7 +68,7 @@ FreeCompositeClientWindow (pointer value, XID ccwid)
}
static int
-FreeCompositeClientSubwindows (pointer value, XID ccwid)
+FreeCompositeClientSubwindows (void * value, XID ccwid)
{
WindowPtr pWin = value;
@@ -203,7 +203,7 @@ ProcCompositeCreateRegionFromBorderClip (ClientPtr client)
return BadAlloc;
REGION_TRANSLATE (pScreen, pRegion, -pWin->drawable.x, -pWin->drawable.y);
- if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource (stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return(client->noClientException);
@@ -237,7 +237,7 @@ ProcCompositeNameWindowPixmap (ClientPtr client)
++pPixmap->refcnt;
- if (!AddResource (stuff->pixmap, RT_PIXMAP, (pointer) pPixmap))
+ if (!AddResource (stuff->pixmap, RT_PIXMAP, (void *) pPixmap))
return BadAlloc;
return(client->noClientException);