diff options
| author | Martin Storsjö <martin@martin.st> | 2012-06-18 23:39:30 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-06-19 20:22:47 +0300 |
| commit | 561687696f8a8764cabc64a482a2b72afc9d4a33 (patch) | |
| tree | 8cf254cdfa2bac76ce89ef7f6105e43eebf24369 | |
| parent | 9d811fd80fbd94a0e44d87cf8ccdab96c2a4af04 (diff) | |
| download | ffmpeg-561687696f8a8764cabc64a482a2b72afc9d4a33.tar.gz | |
network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows
This avoids warnings.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/network.h | 2 | ||||
| -rw-r--r-- | libavformat/os_support.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 72d01d2986..1dc9deb675 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 889a005eeb..4181350b00 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); |