diff options
author | James Almer <jamrial@gmail.com> | 2017-11-11 10:22:11 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-11-11 10:22:11 -0300 |
commit | f87ad3a058bfee786e942106c5c3450c02a66d48 (patch) | |
tree | ffba88e386e67353bbcecf0f3050439052fd1a8f /libavformat | |
parent | 7e76e1ea80052ee95ef33d5341b9251b90766c9c (diff) | |
parent | e41daa62465036ad36ad0bd14e4936e848d7f07e (diff) |
Merge commit 'e41daa62465036ad36ad0bd14e4936e848d7f07e'
* commit 'e41daa62465036ad36ad0bd14e4936e848d7f07e':
Remove support for building for mingw32ce (Windows CE)
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/os_support.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/os_support.h b/libavformat/os_support.h index ca995f9de6..7a56dc9a7c 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -40,7 +40,7 @@ #endif #endif -#if defined(_WIN32) && !defined(__MINGW32CE__) +#ifdef _WIN32 # include <fcntl.h> # ifdef lseek # undef lseek @@ -54,7 +54,7 @@ # undef fstat # endif # define fstat(f,s) _fstati64((f), (s)) -#endif /* defined(_WIN32) && !defined(__MINGW32CE__) */ +#endif /* defined(_WIN32) */ #ifdef __ANDROID__ @@ -139,9 +139,7 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout); #endif /* HAVE_POLL_H */ #endif /* CONFIG_NETWORK */ -#if defined(__MINGW32CE__) -#define mkdir(a, b) _mkdir(a) -#elif defined(_WIN32) +#ifdef _WIN32 #include <stdio.h> #include <windows.h> #include "libavutil/wchar_filename.h" |