diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
| commit | edce25213ffc81389909c827c9aaac27b736b483 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/hw/nxagent/Handlers.c | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| parent | 68dd0b52e13c844d662192654fb10cb993257a59 (diff) | |
| download | nx-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/hw/nxagent/Handlers.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 1fc6bbf8b..0396a458e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -161,7 +161,7 @@ struct _DispatchRec nxagentDispatch = { UNDEFINED, 0, 0, 0 }; extern int nxagentSkipImage; -void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) +void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask) { /* * Zero timeout. @@ -569,7 +569,7 @@ void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask) #endif } -void nxagentWakeupHandler(pointer data, int count, pointer mask) +void nxagentWakeupHandler(void * data, int count, void * mask) { #ifdef BLOCKS fprintf(stderr, "[Begin wakeup]\n"); @@ -723,7 +723,7 @@ void nxagentWakeupHandler(pointer data, int count, pointer mask) #endif } -void nxagentShadowBlockHandler(pointer data, struct timeval **timeout, pointer mask) +void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mask) { static struct timeval zero; @@ -851,7 +851,7 @@ FIXME: Must queue multiple writes and handle #endif } -void nxagentShadowWakeupHandler(pointer data, int count, pointer mask) +void nxagentShadowWakeupHandler(void * data, int count, void * mask) { #ifdef BLOCKS fprintf(stderr, "[Begin wakeup]\n"); |