aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <andreas.faerber@web.de>2012-05-28 19:52:35 +0200
committerJan Kiszka <jan.kiszka@siemens.com>2012-05-28 22:44:27 +0200
commit917cfc1f266b554ea9ab4d958fa048bd27bce58f (patch)
treef9abc013ffebeac22ff4c486e4dfd4562fc23f81
parent9b24d8e987d1249836cd4bccebf7c3a33025b293 (diff)
downloadqemu-arm-917cfc1f266b554ea9ab4d958fa048bd27bce58f.tar.gz
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>
-rw-r--r--slirp/tcp_output.c1
1 files changed, 1 insertions, 0 deletions
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 */
/*