diff options
| author | Vincent Torri <vincent_dot_torri_at_gmail_dot_com> | 2012-01-29 10:45:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-03 19:51:13 +0100 |
| commit | ed3c0fe85dd5c228e98126b18e50ffb617e77070 (patch) | |
| tree | 29ecb8889c7310a5955d81398010d24d9edece34 | |
| parent | 1f0fa80bfa7a0a2ee455679510761f7e138444ae (diff) | |
| download | ffmpeg-ed3c0fe85dd5c228e98126b18e50ffb617e77070.tar.gz | |
Remove some warnings when compiling with mingw (mingw-w64, 32 bits)
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/network.h | 12 | ||||
| -rw-r--r-- | libavformat/os_support.h | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 9f7b78202e..191c00891f 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -31,9 +31,21 @@ #include <winsock2.h> #include <ws2tcpip.h> +#ifdef EPROTONOSUPPORT +# undef EPROTONOSUPPORT +#endif #define EPROTONOSUPPORT WSAEPROTONOSUPPORT +#ifdef ETIMEDOUT +# undef ETIMEDOUT +#endif #define ETIMEDOUT WSAETIMEDOUT +#ifdef ECONNREFUSED +# undef ECONNREFUSED +#endif #define ECONNREFUSED WSAECONNREFUSED +#ifdef EINPROGRESS +# undef EINPROGRESS +#endif #define EINPROGRESS WSAEINPROGRESS int ff_neterrno(void); diff --git a/libavformat/os_support.h b/libavformat/os_support.h index fca5b2a813..159d4d7f85 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -31,6 +31,9 @@ #if defined(__MINGW32__) && !defined(__MINGW32CE__) # include <fcntl.h> +# ifdef lseek +# undef lseek +# endif # define lseek(f,p,w) _lseeki64((f), (p), (w)) # define stat _stati64 # define fstat(f,s) _fstati64((f), (s)) |