summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-11 02:23:02 +0100
committerwm4 <wm4@nowhere>2015-01-11 02:23:02 +0100
commit3b091995a03f431cc8c14e2e4488af6f66191621 (patch)
tree49ead1574fc24fe49140f472c7e18f3e36dda2be /player
parente96c08ecb542fc7dc670cc9fd4abb6feb1679d15 (diff)
downloadmpv-3b091995a03f431cc8c14e2e4488af6f66191621.tar.bz2
mpv-3b091995a03f431cc8c14e2e4488af6f66191621.tar.xz
win32: drop hacks for possibly broken static pthreads-win32 linking
We now use threads and other pthread API a lot, and not always we use it from threads created with pthread_create() (or the main thread). As I understand, with static linking we would have to use pthread_win32_thread_attach/detach_np() every time we enter or leave a foreign thread. We don't do this, and it's not feasible either, so it's just broken. This still should work with dynamic pthreads-win32. The MinGW pthread implementation should be unaffected from all of this.
Diffstat (limited to 'player')
-rw-r--r--player/main.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/player/main.c b/player/main.c
index 48bcab0bef..a51b2a2f0e 100644
--- a/player/main.c
+++ b/player/main.c
@@ -274,14 +274,6 @@ static bool handle_help_options(struct MPContext *mpctx)
return opt_exit;
}
-#ifdef PTW32_STATIC_LIB
-static void detach_ptw32(void)
-{
- pthread_win32_thread_detach_np();
- pthread_win32_process_detach_np();
-}
-#endif
-
static void osdep_preinit(int *p_argc, char ***p_argv)
{
char *enable_talloc = getenv("MPV_LEAK_REPORT");
@@ -295,12 +287,6 @@ static void osdep_preinit(int *p_argc, char ***p_argv)
mp_get_converted_argv(p_argc, p_argv);
#endif
-#ifdef PTW32_STATIC_LIB
- pthread_win32_process_attach_np();
- pthread_win32_thread_attach_np();
- atexit(detach_ptw32);
-#endif
-
#if defined(__MINGW32__) || defined(__CYGWIN__)
// stop Windows from showing all kinds of annoying error dialogs
SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);