RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check for winsock2.h instead of __MINGW32__ 

Originally committed as revision 9988 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2007-08-08 19:18:10 +00:00
parent 0bd5396778
commit 6ff3f3e7ce
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -695,6 +695,7 @@ HAVE_LIST="
sys_soundcard_h sys_soundcard_h
termios_h termios_h
threads threads
winsock2_h
" "
CMDLINE_SELECT=" CMDLINE_SELECT="
@ -1534,6 +1535,7 @@ check_header termios.h
check_header conio.h check_header conio.h
check_header arpa/inet.h check_header arpa/inet.h
check_header winsock2.h
check_func inet_aton check_func inet_aton
enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no" enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no"

2
libavformat/network.h
View File

@ -21,7 +21,7 @@
#ifndef NETWORK_H #ifndef NETWORK_H
#define NETWORK_H #define NETWORK_H
#ifdef __MINGW32__ #ifdef HAVE_WINSOCK2_H
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>

8
libavformat/os_support.c
View File

@ -25,7 +25,7 @@
#include <fcntl.h> #include <fcntl.h>
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_SYS_POLL_H
#if defined(__MINGW32__) #ifdef HAVE_WINSOCK2_H
#include <winsock2.h> #include <winsock2.h>
#else #else
#include <sys/select.h> #include <sys/select.h>
@ -70,7 +70,7 @@ 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__ #ifdef HAVE_WINSOCK2_H
return ioctlsocket(socket, FIONBIO, &enable); return ioctlsocket(socket, FIONBIO, &enable);
#else #else
if (enable) if (enable)
@ -92,7 +92,7 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
int n; int n;
int rc; int rc;
#ifdef __MINGW32__ #ifdef HAVE_WINSOCK2_H
if (numfds >= FD_SETSIZE) { if (numfds >= FD_SETSIZE) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
@ -107,7 +107,7 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
for(i = 0; i < numfds; i++) { for(i = 0; i < numfds; i++) {
if (fds[i].fd < 0) if (fds[i].fd < 0)
continue; continue;
#ifndef __MINGW32__ #ifndef HAVE_WINSOCK2_H
if (fds[i].fd >= FD_SETSIZE) { if (fds[i].fd >= FD_SETSIZE) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;

3
libavformat/os_support.h
View File

@ -43,6 +43,9 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
# define usleep(t) Sleep((t) / 1000) # define usleep(t) Sleep((t) / 1000)
# include <fcntl.h> # include <fcntl.h>
# define lseek(f,p,w) _lseeki64((f), (p), (w)) # define lseek(f,p,w) _lseeki64((f), (p), (w))
#endif
#ifdef HAVE_WINSOCK2_H
# define HAVE_CLOSESOCKET 1 # define HAVE_CLOSESOCKET 1
#endif #endif