aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/randr/randr.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/randr/randr.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/randr/randr.c')
-rw-r--r--nx-X11/programs/Xserver/randr/randr.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/randr/randr.c b/nx-X11/programs/Xserver/randr/randr.c
index f565617e6..eb50aeb3d 100644
--- a/nx-X11/programs/Xserver/randr/randr.c
+++ b/nx-X11/programs/Xserver/randr/randr.c
@@ -84,8 +84,8 @@ int rrPrivIndex = -1;
static void
RRClientCallback (CallbackListPtr *list,
- pointer closure,
- pointer data)
+ void * closure,
+ void * data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -304,7 +304,7 @@ Bool RRScreenInit(ScreenPtr pScreen)
/*ARGSUSED*/
static int
-RRFreeClient (pointer data, XID id)
+RRFreeClient (void * data, XID id)
{
RREventPtr pRREvent;
WindowPtr pWin;
@@ -325,13 +325,13 @@ RRFreeClient (pointer data, XID id)
*pHead = pRREvent->next;
}
}
- xfree ((pointer) pRREvent);
+ xfree ((void *) pRREvent);
return 1;
}
/*ARGSUSED*/
static int
-RRFreeEvents (pointer data, XID id)
+RRFreeEvents (void * data, XID id)
{
RREventPtr *pHead, pCur, pNext;
@@ -339,9 +339,9 @@ RRFreeEvents (pointer data, XID id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource (pCur->clientResource, RRClientType);
- xfree ((pointer) pCur);
+ xfree ((void *) pCur);
}
- xfree ((pointer) pHead);
+ xfree ((void *) pHead);
return 1;
}
@@ -390,7 +390,7 @@ RRExtensionInit (void)
}
static int
-TellChanged (WindowPtr pWin, pointer value)
+TellChanged (WindowPtr pWin, void * value)
{
RREventPtr *pHead, pRREvent;
ClientPtr client;
@@ -452,7 +452,7 @@ RRTellChanged (ScreenPtr pScreen)
pScrPriv->configChanged = FALSE;
}
pScrPriv->changed = FALSE;
- WalkTree (pScreen, TellChanged, (pointer) pScreen);
+ WalkTree (pScreen, TellChanged, (void *) pScreen);
for (i = 0; i < pScrPriv->numOutputs; i++)
pScrPriv->outputs[i]->changed = FALSE;
for (i = 0; i < pScrPriv->numCrtcs; i++)