highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r9095 invalidly removed the check for non-winsock

Browse Source 
Originally committed as revision 9096 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi
2007-05-21 16:08:03 +00:00
parent 7235183df9
commit 3e2e29fb00
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/os_support.c
View File

@ -139,10 +139,12 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
int n; int n;
int rc; int rc;
#ifdef __MINGW32__
if (numfds >= FD_SETSIZE) { if (numfds >= FD_SETSIZE) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
#endif
FD_ZERO(&read_set); FD_ZERO(&read_set);
FD_ZERO(&write_set); FD_ZERO(&write_set);
@ -152,6 +154,12 @@ 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__
if (fds[i].fd >= FD_SETSIZE) {
errno = EINVAL;
return -1;
}
#endif
if (fds[i].events & POLLIN) FD_SET(fds[i].fd, &read_set); if (fds[i].events & POLLIN) FD_SET(fds[i].fd, &read_set);
if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set); if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set);