diff options
| author | Martin Storsjö <martin@martin.st> | 2017-07-05 12:36:03 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2017-07-05 13:55:12 +0300 |
| commit | 4d330da006fe48178a4c8047f06270925eaedf63 (patch) | |
| tree | 0b234ba70db3e881e63cfe6c930256e3fc05da96 | |
| parent | 1912973a2d0a4d7f8e323eb23ee4e0e29d5852ca (diff) | |
| download | ffmpeg-4d330da006fe48178a4c8047f06270925eaedf63.tar.gz | |
os_support: Use HAVE_UWP instead of manually checking WINAPI_FAMILY
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/os_support.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 965e16fa5e..55c2fdb1f1 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; |