From 917cfc1f266b554ea9ab4d958fa048bd27bce58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 28 May 2012 19:52:35 +0200 Subject: slirp: Avoid redefining MAX_TCPOPTLEN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Stefan Weil Signed-off-by: Andreas Färber Signed-off-by: Jan Kiszka --- slirp/tcp_output.c | 1 + 1 file changed, 1 insertion(+) diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c index 779314bf9a..8aa3d90470 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 */ /* -- cgit v1.2.3