virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows

Browse Source 
This avoids warnings.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-06-18 23:39:30 +03:00
parent 9d811fd80f
commit 561687696f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/network.h
View File

@ -35,6 +35,8 @@
#define ETIMEDOUT WSAETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT
#define ECONNREFUSED WSAECONNREFUSED #define ECONNREFUSED WSAECONNREFUSED
#define EINPROGRESS WSAEINPROGRESS #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); int ff_neterrno(void);
#else #else

3
libavformat/os_support.c
View File

@ -252,7 +252,8 @@ const char *ff_gai_strerror(int ecode)
int ff_socket_nonblock(int socket, int enable) int ff_socket_nonblock(int socket, int enable)
{ {
#if HAVE_WINSOCK2_H #if HAVE_WINSOCK2_H
return ioctlsocket(socket, FIONBIO, &enable); u_long param = enable;
return ioctlsocket(socket, FIONBIO, &param);
#else #else
if (enable) if (enable)
return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK); return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK);