From 620d9edb2549e4cdbf07b61dae92a22d6fc7e971 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 19 Oct 2012 23:26:38 -0400 Subject: [PATCH] Rename __wl_container_of macro to just wl_container_of The _* namespace and identifiers with double underscore are reserved by the C standard. That makes __wl_container_of is double plus bad, so lets just call it wl_container_of. --- src/wayland-util.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/wayland-util.h b/src/wayland-util.h index 4b1eca0..257a5d1 100644 --- a/src/wayland-util.h +++ b/src/wayland-util.h @@ -110,40 +110,40 @@ int wl_list_empty(struct wl_list *list); void wl_list_insert_list(struct wl_list *list, struct wl_list *other); #ifdef __GNUC__ -#define __wl_container_of(ptr, sample, member) \ +#define wl_container_of(ptr, sample, member) \ (__typeof__(sample))((char *)(ptr) - \ ((char *)&(sample)->member - (char *)(sample))) #else -#define __wl_container_of(ptr, sample, member) \ +#define wl_container_of(ptr, sample, member) \ (void *)((char *)(ptr) - \ ((char *)&(sample)->member - (char *)(sample))) #endif #define wl_list_for_each(pos, head, member) \ - for (pos = 0, pos = __wl_container_of((head)->next, pos, member); \ + for (pos = 0, pos = wl_container_of((head)->next, pos, member); \ &pos->member != (head); \ - pos = __wl_container_of(pos->member.next, pos, member)) + pos = wl_container_of(pos->member.next, pos, member)) #define wl_list_for_each_safe(pos, tmp, head, member) \ for (pos = 0, tmp = 0, \ - pos = __wl_container_of((head)->next, pos, member), \ - tmp = __wl_container_of((pos)->member.next, tmp, member); \ + pos = wl_container_of((head)->next, pos, member), \ + tmp = wl_container_of((pos)->member.next, tmp, member); \ &pos->member != (head); \ pos = tmp, \ - tmp = __wl_container_of(pos->member.next, tmp, member)) + tmp = wl_container_of(pos->member.next, tmp, member)) #define wl_list_for_each_reverse(pos, head, member) \ - for (pos = 0, pos = __wl_container_of((head)->prev, pos, member); \ + for (pos = 0, pos = wl_container_of((head)->prev, pos, member); \ &pos->member != (head); \ - pos = __wl_container_of(pos->member.prev, pos, member)) + pos = wl_container_of(pos->member.prev, pos, member)) #define wl_list_for_each_reverse_safe(pos, tmp, head, member) \ for (pos = 0, tmp = 0, \ - pos = __wl_container_of((head)->prev, pos, member), \ - tmp = __wl_container_of((pos)->member.prev, tmp, member); \ + pos = wl_container_of((head)->prev, pos, member), \ + tmp = wl_container_of((pos)->member.prev, tmp, member); \ &pos->member != (head); \ pos = tmp, \ - tmp = __wl_container_of(pos->member.prev, tmp, member)) + tmp = wl_container_of(pos->member.prev, tmp, member)) struct wl_array { size_t size; -- 2.7.4