Module: libav
Branch: master
Commit: 4d330da006fe48178a4c8047f06270925eaedf63
Author: Martin Storsjö <mar...@martin.st>
Committer: Martin Storsjö <mar...@martin.st>
Date: Wed Jul 5 12:36:03 2017 +0300
os_support: Use HAVE_UWP instead of manually checking WINAPI_FAMILY
Signed-off-by: Martin Storsjö <mar...@martin.st>
---
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;
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
