From 31b78ad7fa97d8047b609c1647a273e72612d425 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 17 May 2018 20:58:49 +0200 Subject: misc: move mp_cancel from stream.c to thread_tools.c It seems a bit inappropriate to have dumped this into stream.c, even if it's roughly speaking its main user. At least it made its way somewhat unfortunately to other components not related to the stream or demuxer layer at all. I'm too greedy to give this weird helper its own file, so dump it into thread_tools.c. Probably a somewhat pointless change. --- osdep/subprocess-posix.c | 3 ++- osdep/subprocess-win.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'osdep') diff --git a/osdep/subprocess-posix.c b/osdep/subprocess-posix.c index a5fe43c6d4..ff78eb42f8 100644 --- a/osdep/subprocess-posix.c +++ b/osdep/subprocess-posix.c @@ -26,8 +26,9 @@ #include "osdep/subprocess.h" -#include "osdep/io.h" #include "common/common.h" +#include "misc/thread_tools.h" +#include "osdep/io.h" #include "stream/stream.h" extern char **environ; diff --git a/osdep/subprocess-win.c b/osdep/subprocess-win.c index bbb1f6f7fd..b5a9e1a24d 100644 --- a/osdep/subprocess-win.c +++ b/osdep/subprocess-win.c @@ -27,6 +27,7 @@ #include "common/common.h" #include "stream/stream.h" #include "misc/bstr.h" +#include "misc/thread_tools.h" static void write_arg(bstr *cmdline, char *arg) { -- cgit v1.2.3