| commit | e20e48a8020a3b95eea28c89310d2ff14ad4aca2 | |
| author | Andreas Färber <andreas.faerber@web.de> | |
| Fri, 27 Apr 2012 22:29:05 +0000 (28 00:29 +0200) | ||
| committer | Jan Kiszka <jan.kiszka@siemens.com> | |
| Mon, 28 May 2012 11:45:33 +0000 (28 13:45 +0200) | ||
| tree | 96ab3e0cc884ce9f7ca5f4ed942b4dc3d0fab87f | treesnapshot (tar.gz zip) |
| parent | 24f50d7ea5896a30b0e78f68884586bb8b40ff97 | commitdiff |
slirp: Untangle TCPOLEN_* from TCPOPT_*
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 <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
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 <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
| slirp/tcp.h | diffblobblamehistory |