[sane-devel] [PATCH] Fix compilation of saned.c under OS X

Olaf Meeuwissen paddy-hack at member.fsf.org
Sat Jun 25 02:12:25 UTC 2016


Yurii Kolesnykov writes:

> ---
>  frontend/saned.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/frontend/saned.c b/frontend/saned.c
> index 3506eb3..5b28be4 100644
> --- a/frontend/saned.c
> +++ b/frontend/saned.c
> @@ -792,7 +792,7 @@ check_host (int fd)
>  #ifdef ENABLE_IPV6
>    sin6 = &remote_address.sin6;
>  
> -  if (IN6_IS_ADDR_V4MAPPED (sin6->sin6_addr.s6_addr))
> +  if (IN6_IS_ADDR_V4MAPPED ((struct in6_addr *)sin6->sin6_addr.s6_addr))
>      {
>        DBG (DBG_DBG, "check_host: detected an IPv4-mapped address\n");
>        remote_ipv4 = remote_ip + 7;
> @@ -849,7 +849,7 @@ check_host (int fd)
>  	break;
>  #ifdef ENABLE_IPV6
>        case AF_INET6:
> -	if (IN6_IS_ADDR_LOOPBACK (sin6->sin6_addr.s6_addr))
> +	if (IN6_IS_ADDR_LOOPBACK ((struct in6_addr *)sin6->sin6_addr.s6_addr))
>  	  {
>  	    DBG (DBG_MSG,
>  		 "check_host: remote host is IN6_LOOPBACK: access granted\n");
> -- 
> 2.9.0

Just pushed this to Alioth.

Question: Don't you need these in pixma_bjnp.c too?
Nit-pick: POSIX.1-2001 says these macros take a const struct in6_addr*

Thanks,
-- 
Olaf Meeuwissen, LPIC-2            FSF Associate Member since 2004-01-27
 GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13  F43E B8A4 A88A F84A 2DD9
 Support Free Software                        https://my.fsf.org/donate
 Join the Free Software Foundation              https://my.fsf.org/join




More information about the sane-devel mailing list