diff options
author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:05:51 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:24:11 -0800 |
commit | 60014a4a98ff924ae7f6840781f768c1cc93bbab (patch) | |
tree | a956a03a6a7c87cac4d48fb95b66fec313d87fde /Xi/xiproperty.c | |
parent | 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff) |
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>
Diffstat (limited to 'Xi/xiproperty.c')
-rw-r--r-- | Xi/xiproperty.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 796ba0948..463607d33 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -723,10 +723,10 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type, total_len = prop_value->size + len; if (mode == PropModeReplace || len > 0) { - pointer new_data = NULL, old_data = NULL; + void *new_data = NULL, *old_data = NULL; total_size = total_len * size_in_bytes; - new_value.data = (pointer) malloc(total_size); + new_value.data = (void *) malloc(total_size); if (!new_value.data && total_size) { if (add) XIDestroyDeviceProperty(prop); @@ -742,13 +742,13 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type, old_data = NULL; break; case PropModeAppend: - new_data = (pointer) (((char *) new_value.data) + + new_data = (void *) (((char *) new_value.data) + (prop_value->size * size_in_bytes)); old_data = new_value.data; break; case PropModePrepend: new_data = new_value.data; - old_data = (pointer) (((char *) new_value.data) + + old_data = (void *) (((char *) new_value.data) + (prop_value->size * size_in_bytes)); break; } |