diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2007-05-15 14:58:30 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2007-05-15 14:58:30 +0000 |
| commit | 5676d140a9e93aeead7b17f01d42fb8987b1dd60 (patch) | |
| tree | 46929e739b9164ebd43074e38f4035a8da12489d | |
| parent | 124bed6fb2dfb937ea7b76121d5f8eba47d15d68 (diff) | |
| download | ffmpeg-5676d140a9e93aeead7b17f01d42fb8987b1dd60.tar.gz | |
initial mingw networking support
Originally committed as revision 9029 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/network.h | 16 | ||||
| -rw-r--r-- | libavformat/os_support.c | 4 |
2 files changed, 17 insertions, 3 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 6ceba41902..723b4f9536 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -21,16 +21,26 @@ #ifndef NETWORK_H #define NETWORK_H +#ifdef __MINGW32__ +#include <winsock2.h> +#include <ws2tcpip.h> + +#define ff_neterrno() WSAGetLastError() +#define FF_NETERROR(err) WSA##err +#define WSAEAGAIN WSAEWOULDBLOCK +#else #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif #include <netdb.h> #define ff_neterrno() errno #define FF_NETERROR(err) err +#endif + +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif int ff_socket_nonblock(int socket, int enable); diff --git a/libavformat/os_support.c b/libavformat/os_support.c index abee749aac..bcb62b8528 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -117,10 +117,14 @@ int resolve_host(struct in_addr *sin_addr, const char *hostname) int ff_socket_nonblock(int socket, int enable) { +#ifdef __MINGW32__ + return ioctlsocket(socket, FIONBIO, &enable); +#else if (enable) return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK); else return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK); +#endif } #endif /* CONFIG_NETWORK */ |