aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/propertyst.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/include/propertyst.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/include/propertyst.h')
-rw-r--r--nx-X11/programs/Xserver/include/propertyst.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/include/propertyst.h b/nx-X11/programs/Xserver/include/propertyst.h
index 177fca171..8f9abd5f8 100644
--- a/nx-X11/programs/Xserver/include/propertyst.h
+++ b/nx-X11/programs/Xserver/include/propertyst.h
@@ -61,7 +61,7 @@ typedef struct _Property {
ATOM type; /* ignored by server */
short format; /* format of data for swapping - 8,16,32 */
long size; /* size of data in (format/8) bytes */
- pointer data; /* private to client */
+ void *data; /* private to client */
#if defined(LBX) || defined(LBX_COMPAT)
/* If space is at a premium and binary compatibility is not
* an issue, you may want to put the owner_pid next to format