[MPlayer-dev-eng] [PATCH] ipv6_mreq/sockaddr_in6/sockaddr_sa_len definition

[Diego Biurrun]

On Tue, Feb 02, 2010 at 01:22:38AM +0900, KO Myung-Hun wrote:
> 
> This patch checks ipv6_mreq/sockaddr_in6/sockaddr_sa_len as FFmpeg
> instead of defining macros unconditionally.

Ah, I see somebody is picking up my unfiinshed business,
excellent :)

> --- configure	(revision 30480)
> +++ configure	(working copy)
> @@ -3212,6 +3219,73 @@
> 
> +echocheck "struct ipv6_mreq"
> +if test "$_struct_ipv6_mreq" = auto; then
> +  _struct_ipv6_mreq=no
> +  cat > $TMPC << EOF
> +#if HAVE_WINSOCK2_H
> +#include <winsock2.h>

FFmpeg uses ws2tcpip.h for the same test.  What gives?

> +int main(void) { struct ipv6_mreq mreq6; return 0; }
> +EOF
> +  cc_check $cc_check_winsock2_h && _struct_ipv6_mreq=yes

What is $cc_check_winsock2_h?

> +if test "$_struct_ipv6_mreq" = yes; then
> +  def_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 1"
> +else
> +  def_ipv6_mreq="#define HAVE_STRUCT_IPV6_MREQ 0"
> +fi

Unconditionally #define it to 0 at the top, then you can use && here.

The same comments apply to the other checks.

> @@ -9034,6 +9130,9 @@
>  $def_addrinfo
>  $def_getaddrinfo
>  $def_sockaddr_storage
> +$def_ipv6_mreq
> +$def_sockaddr_in6
> +$def_sockaddr_sa_len

This was previously in alphabetical order..

Diego