summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-04-21 22:57:21 +0200
committerwm4 <wm4@nowhere>2014-04-22 01:42:57 +0200
commitbdfe02158f22da7d078978ee6625701226412a54 (patch)
tree98f86c91a071bfef6afefaa1c3d1e9bcf68c504f /demux
parentc57e51097b1e29a1cd077c69a677f1953d74e159 (diff)
downloadmpv-bdfe02158f22da7d078978ee6625701226412a54.tar.bz2
mpv-bdfe02158f22da7d078978ee6625701226412a54.tar.xz
build: glob() is always available
glob() is mandated by POSIX. For the only non-POSIX platform we support, Windows, we have our own replacement. So the ifdeffery is not needed. Still leave the checks in the configure scripts, because they have to decide whether to compile the replacement or not. (Although this could be special cased to mingw-only, the wscript seems to make this hard.)
Diffstat (limited to 'demux')
-rw-r--r--demux/mf.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/demux/mf.c b/demux/mf.c
index 04c99a3bcc..173593f167 100644
--- a/demux/mf.c
+++ b/demux/mf.c
@@ -26,7 +26,6 @@
#include <limits.h>
#include <sys/types.h>
-#include "config.h"
#include "osdep/io.h"
#include "talloc.h"
#include "common/msg.h"
@@ -46,7 +45,6 @@ static void mf_add(mf_t *mf, const char *fname)
mf_t *open_mf_pattern(void *talloc_ctx, struct mp_log *log, char *filename)
{
-#if defined(HAVE_GLOB) || defined(__MINGW32__)
int error_count = 0;
int count = 0;
@@ -138,10 +136,6 @@ mf_t *open_mf_pattern(void *talloc_ctx, struct mp_log *log, char *filename)
exit_mf:
return mf;
-#else
- mp_fatal(log, "mf support is disabled on your os\n");
- return 0;
-#endif
}
mf_t *open_mf_single(void *talloc_ctx, struct mp_log *log, char *filename)