VLC_OBJECT: expansion safety

3bb56008 · Rémi Denis-Courmont · 94ae9717 · 3bb56008
Commit 3bb56008 authored Aug 13, 2008 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

include/vlc_common.h include/vlc_common.h +6 -2

No files found.
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -532,8 +532,12 @@ typedef struct vlc_object_internals_t vlc_object_internals_t;
 /**@}*/                                                                     \

 /* VLC_OBJECT: attempt at doing a clever cast */
-#define VLC_OBJECT( x ) \
-    (((vlc_object_t *)(x))+0*(x)->be_sure_to_add_VLC_COMMON_MEMBERS_to_struct)
+#ifdef __GNUC__
+# define VLC_OBJECT( x ) \
+    (((vlc_object_t *)(x))+0*(((typeof(x))0)->be_sure_to_add_VLC_COMMON_MEMBERS_to_struct))
+#else
+# define VLC_OBJECT( x ) ((vlc_object_t *)(x))
+#endif

 #define VLC_GC_MEMBERS                                                       \
 /** \name VLC_GC_MEMBERS                                                     \