Cygwin already deals with the win32 character set issues and pretends
the outside world is UTF-8 for us, so no need to do it ourselves.
---
cmdutils.c | 2 +-
libavformat/os_support.c | 2 +-
libavformat/os_support.h | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmdutils.c b/cmdutils.c
index 8e43795..d34037e 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -182,7 +182,7 @@ static const OptionDef *find_option(const OptionDef *po,
const char *name)
return po;
}
-#if HAVE_COMMANDLINETOARGVW
+#if HAVE_COMMANDLINETOARGVW && !defined(__CYGWIN__)
#include <windows.h>
#include <shellapi.h>
/* Will be leaked on exit */
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 2d8a903..72bfc7a 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -27,7 +27,7 @@
#include "avformat.h"
#include "os_support.h"
-#if defined(_WIN32) && !defined(__MINGW32CE__)
+#if defined(_WIN32) && !defined(__MINGW32CE__) && !defined(__CYGWIN__)
#undef open
#undef lseek
#undef stat
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 39d4cb6..56f85b1 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -31,14 +31,14 @@
#include <sys/stat.h>
-#if defined(_WIN32) && !defined(__MINGW32CE__)
+#if defined(_WIN32) && !defined(__MINGW32CE__) && !defined(__CYGWIN__)
# include <fcntl.h>
# define lseek(f,p,w) _lseeki64((f), (p), (w))
# define stat _stati64
# define fstat(f,s) _fstati64((f), (s))
-#endif /* defined(__MINGW32__) && !defined(__MINGW32CE__) */
+#endif /* defined(__MINGW32__) && !defined(__MINGW32CE__) &&
!defined(__CYGWIN__) */
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__)
#if HAVE_DIRECT_H
#include <direct.h>
#elif HAVE_IO_H
@@ -77,7 +77,7 @@ static inline int is_dos_path(const char *path)
#endif
#endif
-#if defined(_WIN32) && !defined(__MINGW32CE__)
+#if defined(_WIN32) && !defined(__MINGW32CE__) && !defined(__CYGWIN__)
int ff_win32_open(const char *filename, int oflag, int pmode);
#define open ff_win32_open
#endif
--
1.8.3.3.755.g001b097
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
