git.videolan.org
/
vlc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Win32 old crappy poll replacement: misc fixes
[vlc.git]
/
src
/
network
/
poll.c
diff --git
a/src/network/poll.c
b/src/network/poll.c
index
553a7e5
..
7aa314d
100644
(file)
--- a/
src/network/poll.c
+++ b/
src/network/poll.c
@@
-46,7
+46,11
@@
int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
{
fd_set rdset, wrset, exset;
struct timeval tv = { 0, 0 };
{
fd_set rdset, wrset, exset;
struct timeval tv = { 0, 0 };
- int val = -1;
+ int val;
+
+resume:
+ val = -1;
+ vlc_testcancel ();
FD_ZERO (&rdset);
FD_ZERO (&wrset);
FD_ZERO (&rdset);
FD_ZERO (&wrset);
@@
-87,13
+91,10
@@
int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
#ifndef HAVE_ALERTABLE_SELECT
# warning FIXME! Fix cancellation and remove this crap.
#ifndef HAVE_ALERTABLE_SELECT
# warning FIXME! Fix cancellation and remove this crap.
-resume:
- vlc_testcancel ();
-
if ((timeout < 0) || (timeout > 50))
{
tv.tv_sec = 0;
if ((timeout < 0) || (timeout > 50))
{
tv.tv_sec = 0;
- tv.tv_usec = 50;
+ tv.tv_usec = 50
000
;
}
else
#endif
}
else
#endif
@@
-105,10
+106,9
@@
resume:
}
val = select (val + 1, &rdset, &wrset, &exset,
}
val = select (val + 1, &rdset, &wrset, &exset,
-
(timeout >= 0) ? &tv : NULL
);
+
/*(timeout >= 0) ?*/ &tv /*: NULL*/
);
#ifndef HAVE_ALERTABLE_SELECT
#ifndef HAVE_ALERTABLE_SELECT
-# warning FIXME! Fix cancellation and remove this crap.
if (val == 0)
{
if (timeout > 0)
if (val == 0)
{
if (timeout > 0)