Commit fda4d4fc authored by alex's avatar alex

initial mingw networking support

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9029 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f35349fe
...@@ -21,16 +21,26 @@ ...@@ -21,16 +21,26 @@
#ifndef NETWORK_H #ifndef NETWORK_H
#define 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/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#include <netdb.h> #include <netdb.h>
#define ff_neterrno() errno #define ff_neterrno() errno
#define FF_NETERROR(err) err #define FF_NETERROR(err) err
#endif
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
int ff_socket_nonblock(int socket, int enable); int ff_socket_nonblock(int socket, int enable);
......
...@@ -117,10 +117,14 @@ int resolve_host(struct in_addr *sin_addr, const char *hostname) ...@@ -117,10 +117,14 @@ int resolve_host(struct in_addr *sin_addr, const char *hostname)
int ff_socket_nonblock(int socket, int enable) int ff_socket_nonblock(int socket, int enable)
{ {
#ifdef __MINGW32__
return ioctlsocket(socket, FIONBIO, &enable);
#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);
else else
return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK); return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK);
#endif
} }
#endif /* CONFIG_NETWORK */ #endif /* CONFIG_NETWORK */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment