threads: remove leading underscores

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index da02ff8234f7b707cb9da710b5799eb4152da2bf..c303420d25435a2dbf188e1138653a72f4f9705d 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -185,8 +185,8 @@ VLC_EXPORT( void, vlc_threadvar_delete, (vlc_threadvar_t *) );
 VLC_EXPORT( int, vlc_threadvar_set, (vlc_threadvar_t, void *) );
 VLC_EXPORT( void *, vlc_threadvar_get, (vlc_threadvar_t) );
 VLC_EXPORT( int,  vlc_thread_create, ( vlc_object_t *, const char *, int, const char *, void * ( * ) ( vlc_object_t * ), int ) LIBVLC_USED );
-VLC_EXPORT( int,  __vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) );
-VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t * ) );
+VLC_EXPORT( int,  vlc_thread_set_priority, ( vlc_object_t *, const char *, int, int ) );
+VLC_EXPORT( void, vlc_thread_join,   ( vlc_object_t * ) );
 
 VLC_EXPORT( int, vlc_clone, (vlc_thread_t *, void * (*) (void *), void *, int) LIBVLC_USED );
 VLC_EXPORT( void, vlc_cancel, (vlc_thread_t) );
@@ -394,13 +394,13 @@ static inline void barrier (void)
  * vlc_thread_set_priority: set the priority of the calling thread
  *****************************************************************************/
 #define vlc_thread_set_priority( P_THIS, PRIORITY )                         \
-    __vlc_thread_set_priority( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PRIORITY )
+    vlc_thread_set_priority( VLC_OBJECT(P_THIS), __FILE__, __LINE__, PRIORITY )
 
 /*****************************************************************************
  * vlc_thread_join: wait until a thread exits
  *****************************************************************************/
 #define vlc_thread_join( P_THIS )                                           \
-    __vlc_thread_join( VLC_OBJECT(P_THIS) )
+    vlc_thread_join( VLC_OBJECT(P_THIS) )
 
 #ifdef __cplusplus
 /**

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 635fd977c34b01cacae2c8b2d7f17dbe3ea2c05c..857a0e5053256a6adf2bcec3e009013d0546633c 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -567,8 +567,8 @@ vlc_sd_Start
 vlc_sd_Stop
 vlc_testcancel
 vlc_thread_create
-__vlc_thread_join
-__vlc_thread_set_priority
+vlc_thread_join
+vlc_thread_set_priority
 vlc_threadvar_create
 vlc_threadvar_delete
 vlc_threadvar_get

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 291b3f3437c6d03fe27ef5b6b55d1e8e51135429..5099041ef18d7948b558ffdeddfb94d6cadc73f6 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -100,12 +100,13 @@ int vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line,
     return i_ret;
 }
 
+#undef vlc_thread_set_priority
 /*****************************************************************************
  * vlc_thread_set_priority: set the priority of the current thread when we
  * couldn't set it in vlc_thread_create (for instance for the main thread)
  *****************************************************************************/
-int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
-                               int i_line, int i_priority )
+int vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
+                             int i_line, int i_priority )
 {
     vlc_object_internals_t *p_priv = vlc_internals( p_this );
 
@@ -164,10 +165,11 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
     return 0;
 }
 
+#undef vlc_thread_join
 /*****************************************************************************
  * vlc_thread_join: wait until a thread exits, inner version
  *****************************************************************************/
-void __vlc_thread_join( vlc_object_t *p_this )
+void vlc_thread_join( vlc_object_t *p_this )
 {
     vlc_object_internals_t *p_priv = vlc_internals( p_this );