]> git.sesse.net Git - vlc/commitdiff
Win32: really fix poll() loop *cough* *cough*
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 5 Feb 2013 17:55:29 +0000 (19:55 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 5 Feb 2013 17:55:51 +0000 (19:55 +0200)
include/vlc_threads.h

index 1197b55cd486cd605633dbdbfe5f2e014c560068..12b56fd79f29ea2d0d37f8aa0a8878f3ceefe3e0 100644 (file)
@@ -392,11 +392,9 @@ static inline int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
 
     do
     {
-        int ugly_timeout = 50;
-        if (timeout >= 50)
-            timeout -= 50;
-        else if ((unsigned)timeout < 50u)
-            ugly_timeout = timeout;
+        int ugly_timeout = ((unsigned)timeout >= 50) ? 50 : timeout;
+        if (timeout >= 0)
+            timeout -= ugly_timeout;
 
         vlc_testcancel ();
         val = poll (fds, nfds, ugly_timeout);