summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--osdep/subprocess-posix.c5
-rw-r--r--osdep/subprocess-win.c5
-rw-r--r--osdep/subprocess.h4
3 files changed, 9 insertions, 5 deletions
diff --git a/osdep/subprocess-posix.c b/osdep/subprocess-posix.c
index 8dcc5f6304..82af7c5f50 100644
--- a/osdep/subprocess-posix.c
+++ b/osdep/subprocess-posix.c
@@ -15,8 +15,6 @@
* with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "osdep/subprocess.h"
-
#include <spawn.h>
#include <poll.h>
#include <unistd.h>
@@ -25,8 +23,11 @@
#include <errno.h>
#include <signal.h>
+#include "osdep/subprocess.h"
+
#include "osdep/io.h"
#include "common/common.h"
+#include "stream/stream.h"
// Normally, this must be declared manually, but glibc is retarded.
#ifndef __GLIBC__
diff --git a/osdep/subprocess-win.c b/osdep/subprocess-win.c
index 04ea4ec3e4..0f6c20126a 100644
--- a/osdep/subprocess-win.c
+++ b/osdep/subprocess-win.c
@@ -16,16 +16,17 @@
*/
#define _WIN32_WINNT 0x0600
-#include "osdep/subprocess.h"
-
#include <windows.h>
#include <string.h>
+#include "osdep/subprocess.h"
+
#include "osdep/io.h"
#include "osdep/atomics.h"
#include "talloc.h"
#include "common/common.h"
+#include "stream/stream.h"
#include "misc/bstr.h"
static void write_arg(bstr *cmdline, char *arg)
diff --git a/osdep/subprocess.h b/osdep/subprocess.h
index 1ab4ddbdd7..09c07da981 100644
--- a/osdep/subprocess.h
+++ b/osdep/subprocess.h
@@ -18,7 +18,9 @@
#ifndef MP_SUBPROCESS_H_
#define MP_SUBPROCESS_H_
-#include "stream/stream.h"
+#include <stddef.h>
+
+struct mp_cancel;
typedef void (*subprocess_read_cb)(void *ctx, char *data, size_t size);