From 4aecee7fc34d5eb3dccf2b8ff070cd1029a14d96 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 15 Apr 2010 18:27:27 +0000 Subject: Fix compile error on mingw where ETIMEDOUT is missing (because it's a WSA error). This patch also changes FF_NETERROR() to be an AVERROR(), i.e. it is always negative, whereas it was previously positive. Originally committed as revision 22887 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/network.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/network.h') diff --git a/libavformat/network.h b/libavformat/network.h index 53bb9c07c7..0fbcbbb227 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -27,8 +27,8 @@ #include #include -#define ff_neterrno() WSAGetLastError() -#define FF_NETERROR(err) WSA##err +#define ff_neterrno() (-WSAGetLastError()) +#define FF_NETERROR(err) (-WSA##err) #define WSAEAGAIN WSAEWOULDBLOCK #else #include @@ -36,8 +36,8 @@ #include #include -#define ff_neterrno() errno -#define FF_NETERROR(err) err +#define ff_neterrno() AVERROR(errno) +#define FF_NETERROR(err) AVERROR(err) #endif #if HAVE_ARPA_INET_H -- cgit v1.2.3