Skip to content

V
vlc-2-2
Commit 68a63466 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix VLC_OBJECT expansion

parent 733940c8
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
include/vlc_common.h
View file @ 68a63466
...@@ -533,12 +533,14 @@ typedef union ...@@ -533,12 +533,14 @@ typedef union
#if defined( __GNUC__ ) && __GNUC__ > 3 #if defined( __GNUC__ ) && __GNUC__ > 3
# ifndef __cplusplus # ifndef __cplusplus
# define VLC_OBJECT( x ) \ # define VLC_OBJECT( x ) \
__builtin_choose_expr(__builtin_offsetof(__typeof__(*x), psz_object_type), \ __builtin_choose_expr( \
(void)0 /* screw you */, (vlc_object_t *)(x)) __builtin_offsetof(__typeof__(*(x)), psz_object_type), \
(void)0 /* screw you */, \
(vlc_object_t *)(x))
# else # else
# define VLC_OBJECT( x ) \ # define VLC_OBJECT( x ) \
((vlc_object_t *)(x) \ ((vlc_object_t *)(x) \
+ 0 * __builtin_offsetof(__typeof__(*x), psz_object_type)) + 0 * __builtin_offsetof(__typeof__(*(x)), psz_object_type))
# endif # endif
#else #else
# define VLC_OBJECT( x ) ((vlc_object_t *)(x)) # define VLC_OBJECT( x ) ((vlc_object_t *)(x))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment