On Wed, Jul 5, 2017 at 12:15 PM, wm4 <nfx...@googlemail.com> wrote: > On Wed, 5 Jul 2017 12:42:22 +0300 > Martin Storsjö <mar...@martin.st> wrote: > >> --- >> libavformat/os_support.h | 14 +------------- >> 1 file changed, 1 insertion(+), 13 deletions(-) >> >> diff --git a/libavformat/os_support.h b/libavformat/os_support.h >> index 965e16f..55c2fdb 100644 >> --- a/libavformat/os_support.h >> +++ b/libavformat/os_support.h >> @@ -129,18 +129,6 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int >> timeout); >> #include <windows.h> >> #include "libavutil/wchar_filename.h" >> >> -#ifdef WINAPI_FAMILY >> -#include <winapifamily.h> >> -// If a WINAPI_FAMILY is defined, check that the desktop API subset >> -// is enabled >> -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) >> -#define USE_MOVEFILEEXA >> -#endif >> -#else >> -// If no WINAPI_FAMILY is defined, assume the full API subset >> -#define USE_MOVEFILEEXA >> -#endif >> - >> #define DEF_FS_FUNCTION(name, wfunc, afunc) \ >> static inline int win32_##name(const char *filename_utf8) \ >> { \ >> @@ -192,7 +180,7 @@ static inline int win32_rename(const char *src_utf8, >> const char *dest_utf8) >> >> fallback: >> /* filename may be be in CP_ACP */ >> -#ifdef USE_MOVEFILEEXA >> +#if !HAVE_UWP >> ret = MoveFileExA(src_utf8, dest_utf8, MOVEFILE_REPLACE_EXISTING); >> if (ret) >> errno = EPERM; > > OK. (Do we really need those ACP hacks? They're ridiculous.)
They are, but some people have non-unicode filenames on their systems and thats the only way to access them. - Hendrik _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel