aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/xdmcp.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/os/xdmcp.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/os/xdmcp.c')
-rw-r--r--nx-X11/programs/Xserver/os/xdmcp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index 032d58f15..675e9c456 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -223,14 +223,14 @@ static void timeout(void);
static void restart(void);
static void XdmcpBlockHandler(
- pointer /*data*/,
+ void * /*data*/,
struct timeval ** /*wt*/,
- pointer /*LastSelectMask*/);
+ void * /*LastSelectMask*/);
static void XdmcpWakeupHandler(
- pointer /*data*/,
+ void * /*data*/,
int /*i*/,
- pointer /*LastSelectMask*/);
+ void * /*LastSelectMask*/);
void XdmcpRegisterManufacturerDisplayID(
char * /*name*/,
@@ -623,7 +623,7 @@ XdmcpInit(void)
XdmcpRegisterDisplayClass (defaultDisplayClass, strlen (defaultDisplayClass));
AccessUsingXdmcp();
RegisterBlockAndWakeupHandlers (XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
DisplayNumber = (CARD16) atoi(display);
get_xdmcp_sock();
@@ -638,7 +638,7 @@ XdmcpReset (void)
if (state != XDM_OFF)
{
RegisterBlockAndWakeupHandlers (XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
send_packet();
}
@@ -683,9 +683,9 @@ XdmcpCloseDisplay(int sock)
/*ARGSUSED*/
static void
XdmcpBlockHandler(
- pointer data, /* unused */
+ void * data, /* unused */
struct timeval **wt,
- pointer pReadmask)
+ void * pReadmask)
{
fd_set *LastSelectMask = (fd_set*)pReadmask;
CARD32 millisToGo;
@@ -714,9 +714,9 @@ XdmcpBlockHandler(
/*ARGSUSED*/
static void
XdmcpWakeupHandler(
- pointer data, /* unused */
+ void * data, /* unused */
int i,
- pointer pReadmask)
+ void * pReadmask)
{
fd_set* LastSelectMask = (fd_set*)pReadmask;
fd_set devicesReadable;