Merge branch 'v0.19.x'

2015-01-26 20:57:29 +01:00
parent 16944b5397 a289dcb9ee
commit ae7e1a22cb
22 changed files with 30 additions and 852 deletions
--- a/src/thread/Name.hxx
+++ b/src/thread/Name.hxx
@@ -23,7 +23,6 @@
 #if defined(HAVE_PTHREAD_SETNAME_NP) && !defined(__NetBSD__)
 #  define HAVE_THREAD_NAME
 #  include <pthread.h>
-#  include <stdio.h>
 #elif defined(HAVE_PRCTL)
 #  include <sys/prctl.h>
 #  ifdef PR_SET_NAME
@@ -31,6 +30,10 @@
 #  endif
 #endif

+#ifdef HAVE_THREAD_NAME
+#  include <stdio.h>
+#endif
+
 static inline void
 SetThreadName(const char *name)
 {