Commit 33112b77 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix libvlc private data alignment (untested)

parent 95b8d816
...@@ -195,8 +195,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) ...@@ -195,8 +195,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
} }
/* Allocate a libvlc instance object */ /* Allocate a libvlc instance object */
p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global), p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global), sizeof (*priv),
sizeof (*p_libvlc) + sizeof (libvlc_priv_t),
VLC_OBJECT_LIBVLC, "libvlc" ); VLC_OBJECT_LIBVLC, "libvlc" );
if( p_libvlc != NULL ) if( p_libvlc != NULL )
i_instances++; i_instances++;
......
...@@ -222,6 +222,8 @@ vlc_object_signal_maybe (vlc_object_t *p_this) ...@@ -222,6 +222,8 @@ vlc_object_signal_maybe (vlc_object_t *p_this)
*/ */
typedef struct libvlc_priv_t typedef struct libvlc_priv_t
{ {
libvlc_int_t public_data;
/* Configuration */ /* Configuration */
vlc_mutex_t config_lock; ///< config file lock vlc_mutex_t config_lock; ///< config file lock
char * psz_configfile; ///< location of config file char * psz_configfile; ///< location of config file
...@@ -263,7 +265,7 @@ typedef struct libvlc_priv_t ...@@ -263,7 +265,7 @@ typedef struct libvlc_priv_t
static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
{ {
return (libvlc_priv_t *)(libvlc + 1); return (libvlc_priv_t *)libvlc;
} }
void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist ); void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );
......
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