summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-22 10:32:48 +0200
committerwm4 <wm4@nowhere>2017-06-22 13:17:40 +0200
commit9f461b85bfa3aa67d7f9c53a09eb9aa34169350f (patch)
tree0a76628d68a20c37fb78b688f98b1ea4d32d6504
parent5c038e69997affd46430970f943a604b92ee96df (diff)
downloadmpv-9f461b85bfa3aa67d7f9c53a09eb9aa34169350f.tar.bz2
mpv-9f461b85bfa3aa67d7f9c53a09eb9aa34169350f.tar.xz
Revert "osdep: NetBSD pthread_setname_np()"
This reverts commit 2e81698d2809836d4cd7f754a78598e7bdf96c0b. Seems like this was a patch applied from someone who can't agree to LGPL relicensing (see previous commit), with the author field not properly set. This is not so important anyway, so just revert it.
-rw-r--r--osdep/threads.c6
-rw-r--r--wscript9
2 files changed, 1 insertions, 14 deletions
diff --git a/osdep/threads.c b/osdep/threads.c
index 53d332396d..8cd4545c1e 100644
--- a/osdep/threads.c
+++ b/osdep/threads.c
@@ -21,10 +21,6 @@
#include "config.h"
-#if HAVE_BSD_THREAD_NAME
-#include <pthread_np.h>
-#endif
-
#include "threads.h"
#include "timer.h"
@@ -49,8 +45,6 @@ void mpthread_set_name(const char *name)
}
#elif HAVE_WIN32_INTERNAL_PTHREADS || HAVE_BSD_THREAD_NAME
pthread_set_name_np(pthread_self(), tname);
-#elif HAVE_NETBSD_THREAD_NAME
- pthread_setname_np(pthread_self(), "%s", (void *)tname);
#elif HAVE_OSX_THREAD_NAME
pthread_setname_np(tname);
#endif
diff --git a/wscript b/wscript
index 5390596f8e..f117ddbad7 100644
--- a/wscript
+++ b/wscript
@@ -251,15 +251,8 @@ iconv support use --disable-iconv.",
'name': 'bsd-thread-name',
'desc': 'BSD API for setting thread name',
'deps_neg': [ 'glibc-thread-name', 'osx-thread-name' ],
- 'func': check_statement(['pthread.h', 'pthread_np.h'],
- 'pthread_set_name_np(pthread_self(), "ducks")',
- use=['pthreads']),
- }, {
- 'name': 'netbsd-thread-name',
- 'desc': 'NetBSD API for setting thread name',
- 'deps_neg': [ 'glibc-thread-name', 'osx-thread-name', 'bsd-thread-name' ],
'func': check_statement('pthread.h',
- 'pthread_setname_np(pthread_self(), "%s", (void *)"ducks")',
+ 'pthread_set_name_np(pthread_self(), "ducks")',
use=['pthreads']),
}, {
'name': 'bsd-fstatfs',