On 2012-05-27 19:43, Andreas Färber wrote: > Am 28.04.2012 00:29, schrieb Andreas Färber: >> 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. >> >> Cc: Paolo Bonzini <pbonz...@redhat.com> >> Signed-off-by: Andreas Färber <andreas.faer...@web.de> > > Ping! It seems this patch has not been applied yet despite agreement > between Blue and Jan that we should apply this least-invasive version > for 1.1. Please apply / include in a PULL for rc4.
Thanks, queued for 1.1. I'll send a pull as soon as the other small build fixes are available. Jan
signature.asc
Description: OpenPGP digital signature
