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/programs/Xserver/Xext/xf86misc.c | |
| 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/programs/Xserver/Xext/xf86misc.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xf86misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xf86misc.c b/nx-X11/programs/Xserver/Xext/xf86misc.c index a5dc2e212..6de794e1f 100644 --- a/nx-X11/programs/Xserver/Xext/xf86misc.c +++ b/nx-X11/programs/Xserver/Xext/xf86misc.c @@ -265,7 +265,7 @@ ProcXF86MiscGetMouseSettings(client) { xXF86MiscGetMouseSettingsReply rep; char *devname; - pointer mouse; + void * mouse; register int n; DEBUG_P("XF86MiscGetMouseSettings"); @@ -316,7 +316,7 @@ ProcXF86MiscGetKbdSettings(client) register ClientPtr client; { xXF86MiscGetKbdSettingsReply rep; - pointer kbd; + void * kbd; register int n; DEBUG_P("XF86MiscGetKbdSettings"); @@ -348,7 +348,7 @@ ProcXF86MiscSetMouseSettings(client) register ClientPtr client; { MiscExtReturn ret; - pointer mouse; + void * mouse; char *devname = NULL; int major, minor; @@ -369,7 +369,7 @@ ProcXF86MiscSetMouseSettings(client) (int)stuff->resolution, (unsigned long)stuff->flags); } - if ((mouse = MiscExtCreateStruct(MISC_POINTER)) == (pointer) 0) + if ((mouse = MiscExtCreateStruct(MISC_POINTER)) == (void *) 0) return BadAlloc; MiscExtSetMouseValue(mouse, MISC_MSE_PROTO, stuff->mousetype); @@ -425,7 +425,7 @@ ProcXF86MiscSetKbdSettings(client) register ClientPtr client; { MiscExtReturn ret; - pointer kbd; + void * kbd; REQUEST(xXF86MiscSetKbdSettingsReq); DEBUG_P("XF86MiscSetKbdSettings"); @@ -437,7 +437,7 @@ ProcXF86MiscSetKbdSettings(client) (int)stuff->kbdtype, (int)stuff->rate, (int)stuff->delay, stuff->servnumlock); - if ((kbd = MiscExtCreateStruct(MISC_KEYBOARD)) == (pointer) 0) + if ((kbd = MiscExtCreateStruct(MISC_KEYBOARD)) == (void *) 0) return BadAlloc; MiscExtSetKbdValue(kbd, MISC_KBD_TYPE, stuff->kbdtype); |