Don't clutter the production builds with the (useless IMHO) vlc_thread_error

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index 88c0d5eede027ae52018c1a70577398025fe5876..265f11c545e64cd6018f664541d81e7f4c1693dc 100644 (file)
--- a/include/vlc_threads_funcs.h
+++ b/include/vlc_threads_funcs.h
@@ -35,7 +35,7 @@
 /*****************************************************************************
  * Function definitions
  *****************************************************************************/
-VLC_EXPORT( void, __vlc_threads_error, ( vlc_object_t *) );
+VLC_EXPORT( void, vlc_threads_error, ( vlc_object_t *) );
 VLC_EXPORT( int,  __vlc_mutex_init,    ( vlc_object_t *, vlc_mutex_t * ) );
 VLC_EXPORT( int,  __vlc_mutex_init_recursive, ( vlc_object_t *, vlc_mutex_t * ) );
 VLC_EXPORT( int,  __vlc_mutex_destroy, ( const char *, int, vlc_mutex_t * ) );
@@ -50,8 +50,9 @@ VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, const char *, int ) );
 /*****************************************************************************
  * vlc_threads_error: Signalize an error in the threading system
  *****************************************************************************/
-#define vlc_threads_error( P_THIS )                                          \
-    __vlc_threads_error( VLC_OBJECT(P_THIS) )
+#ifdef NDEBUG
+# define vlc_threads_error( P_THIS ) (void)0
+#endif
 
 /*****************************************************************************
  * vlc_threads_init: initialize threads system

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 908f510bc4e19386257f113d52721eb99d2fe7f8..8adc91a9f3c4d0dc05de465c6832a1d9c60582fd 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -83,8 +83,7 @@ vlc_threadvar_t msg_context_global_key;
  * This is especially useful to debug those errors, as this is a nice symbol
  * on which you can break.
  *****************************************************************************/
-void
-__vlc_threads_error( vlc_object_t *p_this )
+void vlc_threads_error( vlc_object_t *p_this )
 {
      msg_Err( p_this, "Error detected. Put a breakpoint in '%s' to debug.",
             __func__ );