diff options
| author | Keith Packard <keithp@keithp.com> | 2015-06-22 09:36:08 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 12:54:40 +0100 |
| commit | 68dd0b52e13c844d662192654fb10cb993257a59 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/include/extensions/XKBsrv.h | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| download | nx-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/include/extensions/XKBsrv.h')
| -rw-r--r-- | nx-X11/include/extensions/XKBsrv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/include/extensions/XKBsrv.h b/nx-X11/include/extensions/XKBsrv.h index 4a9d8edcb..0d262e979 100644 --- a/nx-X11/include/extensions/XKBsrv.h +++ b/nx-X11/include/extensions/XKBsrv.h @@ -294,7 +294,7 @@ extern char * XkbModelUsed,*XkbLayoutUsed,*XkbVariantUsed,*XkbOptionsUsed; extern Bool noXkbExtension; extern Bool XkbWantRulesProp; -extern pointer XkbLastRepeatEvent; +extern void * XkbLastRepeatEvent; extern CARD32 xkbDebugFlags; extern CARD32 xkbDebugCtrls; @@ -336,7 +336,7 @@ extern int DeviceButtonPress,DeviceButtonRelease; #define IsKeypadKey(s) XkbKSIsKeypad(s) #define Status int -#define XPointer pointer +#define XPointer void * #define Display struct _XDisplay #ifndef True @@ -715,7 +715,7 @@ extern void XkbHandleBell( BOOL /* eventOnly */, DeviceIntPtr /* kbd */, CARD8 /* percent */, - pointer /* ctrl */, + void * /* ctrl */, CARD8 /* class */, Atom /* name */, WindowPtr /* pWin */, |