summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-27 12:37:47 +0200
committerwm4 <wm4@nowhere>2017-06-29 10:30:13 +0200
commit70a70b9da347d7ef25a9862af83731b9b0a0d3f1 (patch)
tree541ad35c45560d81498fe246de1a6f70f5a8265f
parent0b77f6fd229f537a309f1d5b37469392e65d279e (diff)
downloadmpv-70a70b9da347d7ef25a9862af83731b9b0a0d3f1.tar.bz2
mpv-70a70b9da347d7ef25a9862af83731b9b0a0d3f1.tar.xz
build: replace glob() check and assume it's always in POSIX
POSIX requires glob(), so no need to check for it. Together with the fact that we can emulate glob() on Windows, glob() is always available.
-rw-r--r--demux/demux_mf.c2
-rw-r--r--options/parse_commandline.c2
-rw-r--r--osdep/io.h2
-rw-r--r--wscript8
-rw-r--r--wscript_build.py2
5 files changed, 5 insertions, 11 deletions
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 02b95e1c15..012854a32f 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -115,7 +115,6 @@ 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 || HAVE_GLOB_WIN32_REPLACEMENT
if (!strchr(filename, '%')) {
strcpy(fname, filename);
if (!strchr(filename, '*'))
@@ -138,7 +137,6 @@ 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/options/parse_commandline.c b/options/parse_commandline.c
index 4b2f4f880e..2eb65e5c8e 100644
--- a/options/parse_commandline.c
+++ b/options/parse_commandline.c
@@ -103,7 +103,7 @@ static bool split_opt(struct parse_state *p)
return false;
}
-#if defined(__MINGW32__) && (HAVE_GLOB || HAVE_GLOB_WIN32_REPLACEMENT)
+#ifdef __MINGW32__
static void process_non_option(struct playlist *files, const char *arg)
{
glob_t gg;
diff --git a/osdep/io.h b/osdep/io.h
index 01c7c8bfdf..61d2a4af55 100644
--- a/osdep/io.h
+++ b/osdep/io.h
@@ -28,7 +28,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#if HAVE_GLOB
+#if HAVE_POSIX
#include <glob.h>
#endif
diff --git a/wscript b/wscript
index 061fb3f76f..58d64837af 100644
--- a/wscript
+++ b/wscript
@@ -208,13 +208,9 @@ iconv support use --disable-iconv.",
'func': check_true,
'deps_any': ['posix-spawn', 'mingw'],
}, {
- 'name': 'glob',
- 'desc': 'glob()',
- 'func': check_statement('glob.h', 'glob("filename", 0, 0, 0)')
- }, {
- 'name': 'glob-win32-replacement',
+ 'name': 'glob-win32',
'desc': 'glob() win32 replacement',
- 'deps_neg': [ 'glob' ],
+ 'deps_neg': [ 'posix' ],
'deps_any': [ 'os-win32', 'os-cygwin' ],
'func': check_true
}, {
diff --git a/wscript_build.py b/wscript_build.py
index 38281ceac7..39c31fe697 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -432,7 +432,7 @@ def build(ctx):
( "osdep/path-unix.c"),
( "osdep/path-win.c", "os-win32" ),
( "osdep/path-win.c", "os-cygwin" ),
- ( "osdep/glob-win.c", "glob-win32-replacement" ),
+ ( "osdep/glob-win.c", "glob-win32" ),
( "osdep/w32_keyboard.c", "os-win32" ),
( "osdep/w32_keyboard.c", "os-cygwin" ),
( "osdep/windows_utils.c", "win32" ),