summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-12-13 22:01:34 +0100
committerKristian Høgsberg <krh@bitplanet.net>2011-12-14 09:16:20 -0500
commit187eace6139754eae58a21303c808a270f70dc3f (patch)
tree38c1d07b6cac4320455e3106bf7abab66cf134a8 /src
parente631ab6cde2fa0d0fe59cc4f5776c9a8b3002989 (diff)
Make wl_list_for_each* work for c++
Diffstat (limited to 'src')
-rw-r--r--src/wayland-util.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/wayland-util.h b/src/wayland-util.h
index 953d51a..625a2d3 100644
--- a/src/wayland-util.h
+++ b/src/wayland-util.h
@@ -117,9 +117,15 @@ int wl_list_length(struct wl_list *list);
int wl_list_empty(struct wl_list *list);
void wl_list_insert_list(struct wl_list *list, struct wl_list *other);
+#ifdef __GNUC__
#define __container_of(ptr, sample, member) \
- (void *)((char *)(ptr) - \
+ (typeof(sample))((char *)(ptr) - \
((char *)&(sample)->member - (char *)(sample)))
+#else
+#define __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 = __container_of((head)->next, pos, member); \