From 0389852db023cd7a3c2a31424f8835ccbc846a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Tue, 25 Jul 2017 22:14:06 +0300 Subject: {demux_mf,osdep/io}: disable glob usage when it is not available This currently is only limited to Android. Its stdlib contains the things that mpv's POSIX check checks for, but unfortunately not glob(). This fixes Android compilation broken in 70a70b9da . --- demux/demux_mf.c | 2 ++ osdep/io.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 012854a32f..04d37f4aef 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -115,6 +115,7 @@ static mf_t *open_mf_pattern(void *talloc_ctx, struct mp_log *log, char *filenam char *fname = talloc_size(mf, strlen(filename) + 32); +#if HAVE_GLOB if (!strchr(filename, '%')) { strcpy(fname, filename); if (!strchr(filename, '*')) @@ -137,6 +138,7 @@ static mf_t *open_mf_pattern(void *talloc_ctx, struct mp_log *log, char *filenam globfree(&gg); goto exit_mf; } +#endif mp_info(log, "search expr: %s\n", filename); diff --git a/osdep/io.h b/osdep/io.h index 61d2a4af55..35c7c52691 100644 --- a/osdep/io.h +++ b/osdep/io.h @@ -28,7 +28,7 @@ #include #include -#if HAVE_POSIX +#if HAVE_GLOB_POSIX #include #endif -- cgit v1.2.3