diff options
author | Andreas Färber <andreas.faerber@web.de> | 2012-05-28 19:52:35 +0200 |
---|---|---|
committer | Jan Kiszka <jan.kiszka@siemens.com> | 2012-05-28 22:44:27 +0200 |
commit | 7121368627fa58932ecbb1fe8972834e8c6a710c (patch) | |
tree | 2e3ffbfd29a7a2538fee19a6fa289348974ee329 | |
parent | 94a7221a5fec2806ca1caf04b671093d6eedde66 (diff) | |
download | slirp-1.1.0-rc4.zip slirp-1.1.0-rc4.tar.gz slirp-1.1.0-rc4.tar.bz2 |
slirp: Avoid redefining MAX_TCPOPTLENv1.1.2v1.1.1v1.1.0-rc4v1.1.0
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-- | tcp_output.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tcp_output.c b/tcp_output.c index 61b38c4..1fe77da 100644 --- a/tcp_output.c +++ b/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 */ /* |