From cffb8baee117710087445c968acc55654f74f508 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Thu, 3 Dec 2015 15:24:58 +0000 Subject: macros: make SPICE_CONTAINEROF more typesafe Check the pointer given is the same type as member pointer. Signed-off-by: Frediano Ziglio Acked-by: Jonathon Jongsma --- spice/macros.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spice/macros.h b/spice/macros.h index cd63528..2efbaff 100644 --- a/spice/macros.h +++ b/spice/macros.h @@ -143,8 +143,14 @@ ((long) ((uint8_t*) &((struct_type*) 0)->member)) #endif +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +#define SPICE_CONTAINEROF(ptr, struct_type, member) ({ \ + const typeof( ((struct_type *)0)->member ) *__mptr = (ptr); \ + ((struct_type *)(void *)((uint8_t *)(__mptr) - SPICE_OFFSETOF(struct_type, member))); }) +#else #define SPICE_CONTAINEROF(ptr, struct_type, member) \ ((struct_type *)(void *)((uint8_t *)(ptr) - SPICE_OFFSETOF(struct_type, member))) +#endif #define SPICE_MEMBER_P(struct_p, struct_offset) \ ((gpointer) ((guint8*) (struct_p) + (glong) (struct_offset))) -- cgit