Merge branch 'master' into static

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

1 files changed, 6 insertions, 0 deletions

diff --git a/threading.h b/threading.h
index dee1cc3c..6ceca641 100644
--- a/threading.h
+++ b/threading.h
@@ -29,6 +29,12 @@ thread_start_low_priority (void (*fn)(void *ctx), void *ctx);
 int
 thread_join (intptr_t tid);
 
+int
+thread_detach (intptr_t tid);
+
+void
+thread_exit (void *retval);
+
 uintptr_t
 mutex_create (void);