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/xibarriers.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/xibarriers.c')
| -rw-r--r-- | Xi/xibarriers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c index 6732ce9dc..a8b92cc18 100644 --- a/Xi/xibarriers.c +++ b/Xi/xibarriers.c @@ -695,7 +695,7 @@ BarrierFreeBarrier(void *data, XID id) return Success; } -static void add_master_func(pointer res, XID id, pointer devid) +static void add_master_func(void *res, XID id, void *devid) { struct PointerBarrier *b; struct PointerBarrierClient *barrier; @@ -712,7 +712,7 @@ static void add_master_func(pointer res, XID id, pointer devid) xorg_list_add(&pbd->entry, &barrier->per_device); } -static void remove_master_func(pointer res, XID id, pointer devid) +static void remove_master_func(void *res, XID id, void *devid) { struct PointerBarrierDevice *pbd; struct PointerBarrierClient *barrier; |