[vlc-devel] commit: VLM: remove leading underscores ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb  7 12:39:14 2010 +0200| [c6a41b08013563858cc9204921c045a7a84f3c07] | committer: Rémi Denis-Courmont 

VLM: remove leading underscores

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6a41b08013563858cc9204921c045a7a84f3c07
---

 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 0ef32ff..cb46dbc 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 46e01fb..678332e 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 857a0e5..61f37d1 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