From 0cef033d4897a0b5878c4213556ba0937bd1ff91 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Thu, 13 Feb 2014 18:18:58 +1100 Subject: glob-win: support Unicode glob-win.c wasn't big, so it was easier to rewrite it. The new version supports Unicode, handles directories properly, sorts the output and puts all its allocations in the same talloc context to simplify the implementation of globfree. Notably, the old glob had error checking code, but didn't do anything with the errors since the error reporting code was commented out. The new glob doesn't copy this behaviour. It just treats errors as if there were no more matching files, which shouldn't matter for mpv, since it ignores glob errors too. To match the other Windows I/O helper functions, the definition is moved to osdep/io.h. --- demux/mf.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'demux') diff --git a/demux/mf.c b/demux/mf.c index b538943aff..04c99a3bcc 100644 --- a/demux/mf.c +++ b/demux/mf.c @@ -26,16 +26,8 @@ #include #include -#include "osdep/io.h" - #include "config.h" - -#if HAVE_GLOB -#include -#else -#include "osdep/glob.h" -#endif - +#include "osdep/io.h" #include "talloc.h" #include "common/msg.h" #include "stream/stream.h" -- cgit v1.2.3