Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / network.h

diff --git a/libavformat/network.h b/libavformat/network.h
index 9f7b78202ee0bbc2262a3ce1388d18ed6fb4274f..191c00891f77ea27cfbb942172fdc83cd95161fe 100644 (file)
--- 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);