From c6a41b08013563858cc9204921c045a7a84f3c07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 7 Feb 2010 12:39:14 +0200 Subject: [PATCH] VLM: remove leading underscores --- include/vlc_vlm.h | 4 ++-- src/input/vlm.c | 7 ++++--- src/libvlccore.sym | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h index 0ef32ffe20..cb46dbc33d 100644 --- a/include/vlc_vlm.h +++ b/include/vlc_vlm.h @@ -184,8 +184,8 @@ struct vlm_message_t extern "C" { #endif -#define vlm_New( a ) __vlm_New( VLC_OBJECT(a) ) -VLC_EXPORT( vlm_t *, __vlm_New, ( vlc_object_t * ) ); +VLC_EXPORT( vlm_t *, vlm_New, ( vlc_object_t * ) ); +#define vlm_New( a ) vlm_New( VLC_OBJECT(a) ) VLC_EXPORT( void, vlm_Delete, ( vlm_t * ) ); VLC_EXPORT( int, vlm_ExecuteCommand, ( vlm_t *, const char *, vlm_message_t ** ) ); VLC_EXPORT( int, vlm_Control, ( vlm_t *p_vlm, int i_query, ... ) ); diff --git a/src/input/vlm.c b/src/input/vlm.c index 46e01fbc90..678332e301 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -113,12 +113,13 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, return VLC_SUCCESS; } +static vlc_mutex_t vlm_mutex = VLC_STATIC_MUTEX; + +#undef vlm_New /***************************************************************************** * vlm_New: *****************************************************************************/ -static vlc_mutex_t vlm_mutex = VLC_STATIC_MUTEX; - -vlm_t *__vlm_New ( vlc_object_t *p_this ) +vlm_t *vlm_New ( vlc_object_t *p_this ) { vlm_t *p_vlm = NULL, **pp_vlm = &(libvlc_priv (p_this->p_libvlc)->p_vlm); char *psz_vlmconf; diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 857a0e5053..61f37d1feb 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -594,7 +594,7 @@ vlm_MessageAdd vlm_MessageDelete vlm_MessageNew vlm_MessageSimpleNew -__vlm_New +vlm_New __vout_AllocatePicture vout_ChromaCmp vout_Close -- 2.39.5