On Fri, Apr 27, 2012 at 22:29, Andreas Färber <afaer...@suse.de> wrote:
> From: Andreas Färber <andreas.faer...@web.de>
>
> Commit b72210568ef0c0fb141a01cffb71a09c4efa0364 (slirp: clean up
> conflicts with system headers) enclosed TCPOLEN_MAXSEG with an #ifdef
> TCPOPT_EOL. This broke the build on illumos, which has TCPOPT_*
> but not TCPOLEN_*.
>
> Move them to their own #ifdef TCPOLEN_MAXSEG section to remedy this.
This is just a band aid for the general problem, please introduce
QEMU_ or SLIRP_ prefix so we that avoid system headers and the
#ifdeffery.
>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Andreas Färber <andreas.faer...@web.de>
> ---
> slirp/tcp.h | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/slirp/tcp.h b/slirp/tcp.h
> index 8299603..2e2b403 100644
> --- a/slirp/tcp.h
> +++ b/slirp/tcp.h
> @@ -79,20 +79,23 @@ struct tcphdr {
> #define TCPOPT_EOL 0
> #define TCPOPT_NOP 1
> #define TCPOPT_MAXSEG 2
> -#define TCPOLEN_MAXSEG 4
> #define TCPOPT_WINDOW 3
> -#define TCPOLEN_WINDOW 3
> #define TCPOPT_SACK_PERMITTED 4 /* Experimental */
> -#define TCPOLEN_SACK_PERMITTED 2
> #define TCPOPT_SACK 5 /* Experimental */
> #define TCPOPT_TIMESTAMP 8
> -#define TCPOLEN_TIMESTAMP 10
> -#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */
>
> #define TCPOPT_TSTAMP_HDR \
> (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
> #endif
>
> +#ifndef TCPOLEN_MAXSEG
> +#define TCPOLEN_MAXSEG 4
> +#define TCPOLEN_WINDOW 3
> +#define TCPOLEN_SACK_PERMITTED 2
> +#define TCPOLEN_TIMESTAMP 10
> +#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */
> +#endif
> +
> /*
> * Default maximum segment size for TCP.
> * With an IP MSS of 576, this is 536,
> --
> 1.7.7
>
>
