Am 28.04.2012 10:18, schrieb Blue Swirl: > 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.
This is a fix for a build regression introduced by Paolo. Do you seriously expect me to rewrite the whole of SLIRP on the eve of 1.1 Hard Freeze? A much easier solution would be to revert Paolo's commit. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
