Merge branch 'master' into static

Conflicts:
	plugins/artwork/artwork.c
	plugins/gtkui/coverart.c

1 files changed, 15 insertions, 0 deletions

diff --git a/threading_pthread.c b/threading_pthread.c
index 9b6cc277..0705128c 100644
--- a/threading_pthread.c
+++ b/threading_pthread.c
@@ -104,6 +104,21 @@ thread_join (intptr_t tid) {
     return 0;
 }
 
+int
+thread_detach (intptr_t tid) {
+    int s = pthread_detach ((pthread_t)tid);
+    if (s) {
+        fprintf (stderr, "pthread_detach failed: %s\n", strerror (s));
+        return -1;
+    }
+    return 0;
+}
+
+void
+thread_exit (void *retval) {
+    pthread_exit (retval);
+}
+
 uintptr_t
 mutex_create_nonrecursive (void) {
     pthread_mutex_t *mtx = malloc (sizeof (pthread_mutex_t));