[vlc-devel] [vlc-commits] LIRC: don't choke on EINTR

[Serdar Dalgıç]

On Sun, 23 Jan 2011 17:02:35 +0100 (CET)
git at videolan.org (Rémi Denis-Courmont) wrote:

Hi;

This commit makes the tarball 1.1.6 FTBFS on Linux.

The attached patch (Adding a line "#include <errno.h>" to
modules/control/lirc.c) solves the issue.

Regards. 

> vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 23 17:46:08 2011 +0200| [bbb16084f341a4dfd4383782805d42aead7348a4] | committer: Rémi Denis-Courmont
> 
> LIRC: don't choke on EINTR
> 
> (cherry picked from commit cf25b55a45ec72aa89ce7089124d860a6e9b2081)
> 
> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=bbb16084f341a4dfd4383782805d42aead7348a4
> ---
> 
>  modules/control/lirc.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/modules/control/lirc.c b/modules/control/lirc.c
> index 5688c97..6270abb 100644
> --- a/modules/control/lirc.c
> +++ b/modules/control/lirc.c
> @@ -154,7 +154,10 @@ static void Run( intf_thread_t *p_intf )
>          /* Wait for data */
>          struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0 };
>          if( poll( &ufd, 1, -1 ) == -1 )
> -            break;
> +            if( errno == EINTR )
> +                continue;
> +            else
> +                break;
>  
>          /* Process */
>          int canc = vlc_savecancel();
> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> http://mailman.videolan.org/listinfo/vlc-commits


-- 
Serdar Dalgıç <serdar at pardus.org.tr>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: add_errno.h.patch
Type: text/x-diff
Size: 374 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20110124/eaac1374/attachment.patch>