aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/input.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/input.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/input.h')
-rw-r--r--nx-X11/programs/Xserver/include/input.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/include/input.h b/nx-X11/programs/Xserver/include/input.h
index bcaa01e6f..88cc98050 100644
--- a/nx-X11/programs/Xserver/include/input.h
+++ b/nx-X11/programs/Xserver/include/input.h
@@ -104,7 +104,7 @@ typedef void (*DeviceUnwrapProc)(
);
typedef struct _DeviceRec {
- pointer devicePrivate;
+ void * devicePrivate;
ProcessInputProc processInputProc; /* current */
ProcessInputProc realInputProc; /* deliver */
ProcessInputProc enqueueInputProc; /* enqueue */
@@ -255,7 +255,7 @@ extern Bool InitFocusClassDeviceStruct(
typedef void (*BellProcPtr)(
int /*percent*/,
DeviceIntPtr /*device*/,
- pointer /*ctrl*/,
+ void * /*ctrl*/,
int);
typedef void (*KbdCtrlProcPtr)(