Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
4d330da0
Commit
4d330da0
authored
7 years ago
by
Martin Storsjö
Browse files
Options
Downloads
Patches
Plain Diff
os_support: Use HAVE_UWP instead of manually checking WINAPI_FAMILY
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
1912973a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavformat/os_support.h
+1
-13
1 addition, 13 deletions
libavformat/os_support.h
with
1 addition
and
13 deletions
libavformat/os_support.h
+
1
−
13
View file @
4d330da0
...
...
@@ -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 */
#if
def USE_MOVEFILEEXA
#if
!HAVE_UWP
ret
=
MoveFileExA
(
src_utf8
,
dest_utf8
,
MOVEFILE_REPLACE_EXISTING
);
if
(
ret
)
errno
=
EPERM
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment