From d45dd31e35190cf08b1e716e7c3bd1468ddd5d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 6 Sep 2018 13:41:52 +0200 Subject: New upstream version 3.23 --- include/libHX/list.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'include/libHX/list.h') diff --git a/include/libHX/list.h b/include/libHX/list.h index a18b17e..3146c22 100644 --- a/include/libHX/list.h +++ b/include/libHX/list.h @@ -63,35 +63,37 @@ static __inline__ bool HXlist_empty(const struct HXlist_head *head) } #define HXlist_for_each(pos, head) \ - for ((pos) = (head)->next; (pos) != (void *)(head); \ + for ((pos) = (head)->next; (pos) != static_cast(void *, (head)); \ (pos) = (pos)->next) #define HXlist_for_each_rev(pos, head) \ - for ((pos) = (head)->prev; (pos) != (void *)(head); \ + for ((pos) = (head)->prev; (pos) != static_cast(void *, (head)); \ (pos) = (pos)->prev) #define HXlist_for_each_safe(pos, n, head) \ - for ((pos) = (head)->next, (n) = (pos)->next; (pos) != (void *)(head); \ + for ((pos) = (head)->next, (n) = (pos)->next; \ + (pos) != static_cast(void *, (head)); \ (pos) = (n), (n) = (pos)->next) #define HXlist_for_each_rev_safe(pos, n, head) \ - for ((pos) = (head)->prev, (n) = (pos)->prev; (pos) != (void *)(head); \ + for ((pos) = (head)->prev, (n) = (pos)->prev; \ + (pos) != static_cast(void *, (head)); \ (pos) = (n), (n) = (pos)->prev) #define HXlist_for_each_entry(pos, head, member) \ for ((pos) = HXlist_entry((head)->next, __typeof__(*(pos)), member); \ - &(pos)->member != (void *)(head); \ + &(pos)->member != static_cast(void *, (head)); \ (pos) = HXlist_entry((pos)->member.next, __typeof__(*(pos)), member)) #define HXlist_for_each_entry_rev(pos, head, member) \ for ((pos) = HXlist_entry((head)->prev, __typeof__(*(pos)), member); \ - &(pos)->member != (void *)(head); \ + &(pos)->member != static_cast(void *, (head)); \ (pos) = HXlist_entry((pos)->member.prev, __typeof__(*(pos)), member)) #define HXlist_for_each_entry_safe(pos, n, head, member) \ for ((pos) = HXlist_entry((head)->next, __typeof__(*(pos)), member), \ (n) = HXlist_entry((pos)->member.next, __typeof__(*(pos)), member); \ - &(pos)->member != (void *)(head); \ + &(pos)->member != static_cast(void *, (head)); \ (pos) = (n), (n) = HXlist_entry((n)->member.next, __typeof__(*(n)), \ member)) @@ -154,7 +156,7 @@ static __inline__ struct HXlist_head * __HXclist_shift(struct HXclist_head *head) { struct HXlist_head *p; - if ((const void *)head == head->list.next) + if (static_cast(const void *, head) == head->list.next) return NULL; p = head->list.next; HXlist_del(p); -- cgit v1.2.3