aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/XTrap/xtrapdi.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-06-22 09:36:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 12:54:40 +0100
commit68dd0b52e13c844d662192654fb10cb993257a59 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/XTrap/xtrapdi.c
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
downloadnx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/XTrap/xtrapdi.c')
-rw-r--r--nx-X11/programs/Xserver/XTrap/xtrapdi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/XTrap/xtrapdi.c b/nx-X11/programs/Xserver/XTrap/xtrapdi.c
index 1055429d4..bdddb6310 100644
--- a/nx-X11/programs/Xserver/XTrap/xtrapdi.c
+++ b/nx-X11/programs/Xserver/XTrap/xtrapdi.c
@@ -195,7 +195,7 @@ static void GetSendColorPlanesRep (ClientPtr client , xResourceReq *req );
* client would be reset here.
*
*/
-int XETrapDestroyEnv(pointer value, XID id)
+int XETrapDestroyEnv(void * value, XID id)
{
xXTrapReq request;
XETrapEnv *penv = XETenv[(long)value];
@@ -251,7 +251,7 @@ void XETrapCloseDown(ExtensionEntry *extEntry)
{
if (XETenv[i] != NULL)
{
- XETrapDestroyEnv((pointer)i,0L);
+ XETrapDestroyEnv((void *)i,0L);
}
}
ignore_grabs = False;
@@ -508,7 +508,7 @@ int XETrapCreateEnv(ClientPtr client)
penv->protocol = 31; /* default to backwards compatibility */
/* prep for client's departure (for memory dealloc, cleanup) */
AddResource(FakeClientID(client->index),XETrapType,
- (pointer)(long)(client->index));
+ (void *)(long)(client->index));
if (XETrapRedirectDevices() == False)
{
status = XETrapErrorBase + BadDevices;