From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYyJ5-00075V-7x for qemu-devel@nongnu.org; Mon, 28 May 2012 07:40:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYyJ3-0001Um-C5 for qemu-devel@nongnu.org; Mon, 28 May 2012 07:40:14 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:41471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYyJ3-0001UR-2j for qemu-devel@nongnu.org; Mon, 28 May 2012 07:40:13 -0400 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate02.web.de (Postfix) with ESMTP id 7F1521C4FA7F8 for ; Mon, 28 May 2012 13:40:10 +0200 (CEST) Message-ID: <4FC36418.3080502@web.de> Date: Mon, 28 May 2012 08:40:08 -0300 From: Jan Kiszka MIME-Version: 1.0 References: <1338138128-53411-1-git-send-email-andreas.faerber@web.de> In-Reply-To: <1338138128-53411-1-git-send-email-andreas.faerber@web.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigA02C594085C4B6910F095B32" Subject: Re: [Qemu-devel] [PATCH for-1.1?] slirp: Avoid redefining MAX_TCPOPTLEN List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: Paolo Bonzini , qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigA02C594085C4B6910F095B32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 2012-05-27 14:02, Andreas F=C3=A4rber wrote: > MAX_TCPOPTLEN is being defined as 32. Darwin has it as 40, causing a > warning. The value is only used to declare an array, into which current= ly > 4 bytes are written at most. It should therefore be acceptable to adopt= > the host's definition. >=20 > Therefore only define MAX_TCPOPTLEN if not already defined. >=20 > Signed-off-by: Andreas F=C3=A4rber > --- > slirp/tcp_output.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) >=20 > diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c > index 779314b..9815123 100644 > --- a/slirp/tcp_output.c > +++ b/slirp/tcp_output.c > @@ -47,7 +47,9 @@ static const u_char tcp_outflags[TCP_NSTATES] =3D { > }; > =20 > =20 > +#ifndef MAX_TCPOPTLEN > #define MAX_TCPOPTLEN 32 /* max # bytes that go in options */ > +#endif > =20 > /* > * Tcp output routine: figure out what should be sent and send it. Let's be conservative for 1.1 and do #undef MAX_TCPOPTLEN instead. Does this work as well? Jan --------------enigA02C594085C4B6910F095B32 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/DZBgACgkQitSsb3rl5xSNHACfSUAs0wjsgPCek8yKQoTMhP8P 3YMAnRfvBJe9x0BwI9Wp97vx+OOjAa1v =HC54 -----END PGP SIGNATURE----- --------------enigA02C594085C4B6910F095B32--