Martin Storsjö <[email protected]> writes: > This avoids warnings. > --- > libavformat/network.h | 2 ++ > libavformat/os_support.c | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavformat/network.h b/libavformat/network.h > index 8f7c19a..1bf811e 100644 > --- a/libavformat/network.h > +++ b/libavformat/network.h > @@ -35,6 +35,8 @@ > #define ETIMEDOUT WSAETIMEDOUT > #define ECONNREFUSED WSAECONNREFUSED > #define EINPROGRESS WSAEINPROGRESS > +#define getsockopt(a, b, c, d, e) getsockopt(a, b, c, (char*) d, e) > +#define setsockopt(a, b, c, d, e) setsockopt(a, b, c, (const char*) d, e) > > int ff_neterrno(void); > #else > diff --git a/libavformat/os_support.c b/libavformat/os_support.c > index 889a005..4181350 100644 > --- a/libavformat/os_support.c > +++ b/libavformat/os_support.c > @@ -252,7 +252,8 @@ const char *ff_gai_strerror(int ecode) > int ff_socket_nonblock(int socket, int enable) > { > #if HAVE_WINSOCK2_H > - return ioctlsocket(socket, FIONBIO, &enable); > + u_long param = enable; > + return ioctlsocket(socket, FIONBIO, ¶m); > #else > if (enable) > return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK); > --
LGTM -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
