From: Andreas Färber <andreas.faerber@web.de>
Date: Mon, 28 May 2012 17:52:35 +0000 (+0200)
Subject: slirp: Avoid redefining MAX_TCPOPTLEN
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~4062^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=917cfc1f266b554ea9ab4d958fa048bd27bce58f;p=sdk%2Femulator%2Fqemu.git

slirp: Avoid redefining MAX_TCPOPTLEN

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 <jan.kiszka@web.de>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

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 */
 
 /*