Re: [Qemu-devel] [PATCH for-1.1 v2] slirp: Avoid redefining MAX_TCPOPTLEN

[Jan Kiszka]

On 2012-05-28 19:52, Andreas Färber wrote:
> MAX_TCPOPTLEN is being defined as 32. Darwin already has it as 40,
> causing a warning. The value is only used to declare an array,
> into which currently 4 bytes are written at most.
> 
> Therefore always override MAX_TCPOPTLEN for now.
> 
> Suggested-by: Jan Kiszka <address@hidden>
> Signed-off-by: Andreas Färber <address@hidden>
> ---
>  slirp/tcp_output.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c
> index 779314b..8aa3d90 100644
> --- a/slirp/tcp_output.c
> +++ b/slirp/tcp_output.c
> @@ -47,6 +47,7 @@ static const u_char  tcp_outflags[TCP_NSTATES] = {
>  };
>  
>  
> +#undef MAX_TCPOPTLEN
>  #define MAX_TCPOPTLEN        32      /* max # bytes that go in options */
>  
>  /*

Thanks, queued for 1.1.

Jan

signature.asc
Description: OpenPGP digital signature