]> git.sesse.net Git - vlc/blobdiff - include/vlc_threads_funcs.h
Update POTFILES.in after moving/renaming files
[vlc] / include / vlc_threads_funcs.h
index ec4aa5a59352628fd039dcf1255167c8517fe8e0..2823aa8385214c3458ab2b312324ec6406b8535a 100644 (file)
@@ -37,6 +37,7 @@
  *****************************************************************************/
 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 * ) );
 VLC_EXPORT( int,  __vlc_cond_init,     ( vlc_object_t *, vlc_cond_t * ) );
 VLC_EXPORT( int,  __vlc_cond_destroy,  ( const char *, int, vlc_cond_t * ) );
@@ -70,6 +71,12 @@ VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, const char *, int ) );
 #define vlc_mutex_init( P_THIS, P_MUTEX )                                   \
     __vlc_mutex_init( VLC_OBJECT(P_THIS), P_MUTEX )
 
+/*****************************************************************************
+ * vlc_mutex_init: initialize a recursive mutex (Don't use it)
+ *****************************************************************************/
+#define vlc_mutex_init_recursive( P_THIS, P_MUTEX )                         \
+    __vlc_mutex_init_recursive( VLC_OBJECT(P_THIS), P_MUTEX )
+
 /*****************************************************************************
  * vlc_mutex_lock: lock a mutex
  *****************************************************************************/
@@ -77,9 +84,9 @@ VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, const char *, int ) );
     __vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX )
 
 #if defined( PTHREAD_COND_T_IN_PTHREAD_H )
-static inline int CAST_PTHREAD_TO_INT (pthread_t th)
+static inline unsigned long int CAST_PTHREAD_TO_INT (pthread_t th)
 {
-     union { pthread_t th; int i; } v = { };
+     union { pthread_t th; unsigned long int i; } v = { };
      v.th = th;
      return v.i;
 }