aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/osdep.h
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/osdep.h
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/osdep.h')
-rw-r--r--nx-X11/programs/Xserver/os/osdep.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h
index b837d7605..e8c2d5959 100644
--- a/nx-X11/programs/Xserver/os/osdep.h
+++ b/nx-X11/programs/Xserver/os/osdep.h
@@ -151,10 +151,10 @@ typedef struct _connectionOutput {
#ifdef K5AUTH
typedef struct _k5_state {
int stageno; /* current stage of auth protocol */
- pointer srvcreds; /* server credentials */
- pointer srvname; /* server principal name */
- pointer ktname; /* key table: principal-key pairs */
- pointer skey; /* session key */
+ void *srvcreds; /* server credentials */
+ void *srvname; /* server principal name */
+ void *ktname; /* key table: principal-key pairs */
+ void *skey; /* session key */
} k5_state;
#endif