Commit 0b55c9c5 authored by Rafaël Carré's avatar Rafaël Carré

fix warning

parent 07c3e97d
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
* The evil global variable. We handle it with care, don't worry. * The evil global variable. We handle it with care, don't worry.
*****************************************************************************/ *****************************************************************************/
static libvlc_global_data_t libvlc_global; static libvlc_global_data_t libvlc_global;
#define p_libvlc_global (&libvlc_global) static libvlc_global_data_t *p_libvlc_global = &libvlc_global;
static libvlc_int_t * p_static_vlc = NULL; static libvlc_int_t * p_static_vlc = NULL;
static volatile unsigned int i_instances = 0; static volatile unsigned int i_instances = 0;
...@@ -139,12 +139,7 @@ libvlc_global_data_t *vlc_global( void ) ...@@ -139,12 +139,7 @@ libvlc_global_data_t *vlc_global( void )
*****************************************************************************/ *****************************************************************************/
libvlc_int_t * vlc_current_object( int i_object ) libvlc_int_t * vlc_current_object( int i_object )
{ {
if( i_object ) return i_object ? vlc_object_get( i_object ) : p_static_vlc;
{
return vlc_object_get( p_libvlc_global, i_object );
}
return p_static_vlc;
} }
......
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