mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-16 05:34:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename __wl_container_of macro to just wl_container_of

Browse source 
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.
This commit is contained in:
Kristian Høgsberg 2012-10-19 23:26:38 -04:00
parent 7ec35d8e13
commit 620d9edb25
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/wayland-util.h
View file

@ -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); void wl_list_insert_list(struct wl_list *list, struct wl_list *other);
#ifdef __GNUC__ #ifdef __GNUC__
#define __wl_container_of(ptr, sample, member) \ #define wl_container_of(ptr, sample, member) \
(__typeof__(sample))((char *)(ptr) - \ (__typeof__(sample))((char *)(ptr) - \
((char *)&(sample)->member - (char *)(sample))) ((char *)&(sample)->member - (char *)(sample)))
#else #else
#define __wl_container_of(ptr, sample, member) \ #define wl_container_of(ptr, sample, member) \
(void *)((char *)(ptr) - \ (void *)((char *)(ptr) - \
((char *)&(sample)->member - (char *)(sample))) ((char *)&(sample)->member - (char *)(sample)))
#endif #endif
#define wl_list_for_each(pos, head, member) \ #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->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) \ #define wl_list_for_each_safe(pos, tmp, head, member) \
for (pos = 0, tmp = 0, \ for (pos = 0, tmp = 0, \
pos = __wl_container_of((head)->next, pos, member), \ pos = wl_container_of((head)->next, pos, member), \
tmp = __wl_container_of((pos)->member.next, tmp, member); \ tmp = wl_container_of((pos)->member.next, tmp, member); \
&pos->member != (head); \ &pos->member != (head); \
pos = tmp, \ 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) \ #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->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) \ #define wl_list_for_each_reverse_safe(pos, tmp, head, member) \
for (pos = 0, tmp = 0, \ for (pos = 0, tmp = 0, \
pos = __wl_container_of((head)->prev, pos, member), \ pos = wl_container_of((head)->prev, pos, member), \
tmp = __wl_container_of((pos)->member.prev, tmp, member); \ tmp = wl_container_of((pos)->member.prev, tmp, member); \
&pos->member != (head); \ &pos->member != (head); \
pos = tmp, \ pos = tmp, \
tmp = __wl_container_of(pos->member.prev, tmp, member)) tmp = wl_container_of(pos->member.prev, tmp, member))
struct wl_array { struct wl_array {
size_t size; size_t size;