diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-09-27 17:53:06 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-09-27 17:53:06 +0000 |
commit | 4a4018aabb79405f1b50809f76e4bff4d0ead33c (patch) | |
tree | bbe31c32ce7b90f7ca8124d215cd1bc28516a259 /xserver/Xi/xibarriers.c | |
parent | 340ecc70b63a19bbc23b3ffc950d5beb49220505 (diff) |
Update to xserver 1.16.1.
Tested by naddy@, jsg@ & kettenis@
Diffstat (limited to 'xserver/Xi/xibarriers.c')
-rw-r--r-- | xserver/Xi/xibarriers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xserver/Xi/xibarriers.c b/xserver/Xi/xibarriers.c index 6732ce9dc..a8b92cc18 100644 --- a/xserver/Xi/xibarriers.c +++ b/xserver/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; |