aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext/sleepuntil.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/sleepuntil.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/sleepuntil.c')
-rw-r--r--nx-X11/programs/Xserver/Xext/sleepuntil.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.c b/nx-X11/programs/Xserver/Xext/sleepuntil.c
index 8e0008cab..da93806f5 100644
--- a/nx-X11/programs/Xserver/Xext/sleepuntil.c
+++ b/nx-X11/programs/Xserver/Xext/sleepuntil.c
@@ -49,10 +49,10 @@ typedef struct _Sertafied {
XID id;
void (*notifyFunc)(
ClientPtr /* client */,
- pointer /* closure */
+ void * /* closure */
);
- pointer closure;
+ void *closure;
} SertafiedRec, *SertafiedPtr;
static SertafiedPtr pPending;
@@ -62,21 +62,21 @@ static int SertafiedGeneration;
static void ClientAwaken(
ClientPtr /* client */,
- pointer /* closure */
+ void * /* closure */
);
static int SertafiedDelete(
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
static void SertafiedBlockHandler(
- pointer /* data */,
+ void * /* data */,
OSTimePtr /* wt */,
- pointer /* LastSelectMask */
+ void * /* LastSelectMask */
);
static void SertafiedWakeupHandler(
- pointer /* data */,
+ void * /* data */,
int /* i */,
- pointer /* LastSelectMask */
+ void * /* LastSelectMask */
);
int
@@ -85,8 +85,8 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
TimeStamp *revive;
void (*notifyFunc)(
ClientPtr /* client */,
- pointer /* closure */);
- pointer closure;
+ void * /* closure */);
+ void *closure;
{
SertafiedPtr pRequest, pReq, pPrev;
@@ -109,7 +109,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
{
if (!RegisterBlockAndWakeupHandlers (SertafiedBlockHandler,
SertafiedWakeupHandler,
- (pointer) 0))
+ (void *) 0))
{
xfree (pRequest);
return FALSE;
@@ -117,7 +117,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
BlockHandlerRegistered = TRUE;
}
pRequest->notifyFunc = 0;
- if (!AddResource (pRequest->id, SertafiedResType, (pointer) pRequest))
+ if (!AddResource (pRequest->id, SertafiedResType, (void *) pRequest))
return FALSE;
if (!notifyFunc)
notifyFunc = ClientAwaken;
@@ -142,7 +142,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
static void
ClientAwaken (client, closure)
ClientPtr client;
- pointer closure;
+ void *closure;
{
if (!client->clientGone)
AttendClient (client);
@@ -151,7 +151,7 @@ ClientAwaken (client, closure)
static int
SertafiedDelete (value, id)
- pointer value;
+ void * value;
XID id;
{
SertafiedPtr pRequest = (SertafiedPtr)value;
@@ -175,9 +175,9 @@ SertafiedDelete (value, id)
static void
SertafiedBlockHandler (data, wt, LastSelectMask)
- pointer data; /* unused */
+ void *data; /* unused */
OSTimePtr wt; /* wait time */
- pointer LastSelectMask;
+ void *LastSelectMask;
{
SertafiedPtr pReq, pNext;
unsigned long delay;
@@ -211,9 +211,9 @@ SertafiedBlockHandler (data, wt, LastSelectMask)
static void
SertafiedWakeupHandler (data, i, LastSelectMask)
- pointer data;
+ void * data;
int i;
- pointer LastSelectMask;
+ void * LastSelectMask;
{
SertafiedPtr pReq, pNext;
TimeStamp now;
@@ -233,7 +233,7 @@ SertafiedWakeupHandler (data, i, LastSelectMask)
{
RemoveBlockAndWakeupHandlers (SertafiedBlockHandler,
SertafiedWakeupHandler,
- (pointer) 0);
+ (void *) 0);
BlockHandlerRegistered = FALSE;
}
}