Fix VLC_OBJECT expansion

68a63466 · Rémi Denis-Courmont · 733940c8 · 68a63466
Commit 68a63466 authored Apr 10, 2011 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

include/vlc_common.h include/vlc_common.h +5 -3

No files found.
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -533,12 +533,14 @@ typedef union
 #if defined( __GNUC__ ) && __GNUC__ > 3
 # ifndef __cplusplus
 #  define VLC_OBJECT( x ) \
-    __builtin_choose_expr(__builtin_offsetof(__typeof__(*x), psz_object_type), \
-                          (void)0 /* screw you */, (vlc_object_t *)(x))
+    __builtin_choose_expr( \
+        __builtin_offsetof(__typeof__(*(x)), psz_object_type), \
+        (void)0 /* screw you */, \
+        (vlc_object_t *)(x))
 # else
 #  define VLC_OBJECT( x ) \
    ((vlc_object_t *)(x) \
-      + 0 * __builtin_offsetof(__typeof__(*x), psz_object_type))
+      + 0 * __builtin_offsetof(__typeof__(*(x)), psz_object_type))
 # endif
 #else
 # define VLC_OBJECT( x ) ((vlc_object_t *)(x))