[vlc-devel] [PATCH 2/2] Android: Fix src/network/udp.c compilation.

[Rémi Denis-Courmont]

Le jeudi 2 juin 2011 15:06:18 Jean-Baptiste Kempf, vous avez écrit :
> From: Rémi Duraffort <ivoire at videolan.org>
> 
> Fixed and Modified-by: Jean-Baptiste Kempf <jb at videolan.org>
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> ---
>  src/network/udp.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/src/network/udp.c b/src/network/udp.c
> index 80522af..2b46197 100644
> --- a/src/network/udp.c
> +++ b/src/network/udp.c
> @@ -375,9 +375,15 @@ net_IPv4Join (vlc_object_t *obj, int fd,
>      {
>  # ifdef IP_ADD_SOURCE_MEMBERSHIP
>          cmd = IP_ADD_SOURCE_MEMBERSHIP;
> +#  ifndef __ANDROID__
>          opt.gsr4.imr_multiaddr = grp->sin_addr;
>          opt.gsr4.imr_sourceaddr = src->sin_addr;
>          opt.gsr4.imr_interface = id;
> +#  else
> +        opt.gsr4.imr_multiaddr = grp->sin_addr.s_addr;
> +        opt.gsr4.imr_sourceaddr = src->sin_addr.s_addr;
> +        opt.gsr4.imr_interface = id.s_addr;
> +#  endif /* __ANDROID__ */
>          optlen = sizeof (opt.gsr4);

This seems to contradict RFC 3678 (and Windows and Linux and every body...). 
But in any case, I believe this is dead code on Android as on any recent Linux 
kernel.

-- 
Rémi Denis-Courmont
http://www.remlab.net/
http://fi.linkedin.com/in/remidenis