Rewrite CAST_PTHREAD_TO_INT in a ISO C valid way - closes #1407

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index 3be83a6566c82c8a574883a9a23b9b83aee4a495..5333d78b477f6292e4946de5fb9f7b9daa4ec795 100644 (file)
--- a/include/vlc_threads_funcs.h
+++ b/include/vlc_threads_funcs.h
@@ -76,10 +76,13 @@ VLC_EXPORT( void, __vlc_thread_join,   ( vlc_object_t *, const char *, int ) );
 #define vlc_mutex_lock( P_MUTEX )                                           \
     __vlc_mutex_lock( __FILE__, __LINE__, P_MUTEX )
 
-#if defined( __APPLE__ ) || defined( __FreeBSD__ )
-#   define CAST_PTHREAD_TO_INT(t) (unsigned long int)(uintptr_t)(void *)t
-#else
-#   define CAST_PTHREAD_TO_INT(t) (unsigned long int)t
+#if defined( PTHREAD_COND_T_IN_PTHREAD_H )
+static inline int CAST_PTHREAD_TO_INT (pthread_t th)
+{
+     union { pthread_t th; int i; } v = { .i = 0 };
+     v.th = th;
+     return v.i;
+}
 #endif
 
 static inline int __vlc_mutex_lock( const char * psz_file, int i_line,