diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-12-23 00:03:15 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-12-23 00:03:15 +0000 |
| commit | 28d657fc0b790e7b338ba624074624e3ce1f457b (patch) | |
| tree | 992ac0a3ef88f11719c798a74267f7b44f90414c /slirp/tcp.h | |
| parent | 4258b780afaa7251d9a7e363fe69e5672464fb56 (diff) | |
| download | qemu-28d657fc0b790e7b338ba624074624e3ce1f457b.tar.gz qemu-28d657fc0b790e7b338ba624074624e3ce1f457b.tar.bz2 qemu-28d657fc0b790e7b338ba624074624e3ce1f457b.zip | |
Fix build warning on Windows.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2270 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'slirp/tcp.h')
| -rw-r--r-- | slirp/tcp.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/slirp/tcp.h b/slirp/tcp.h index 0cd3ab3a49..229293c498 100644 --- a/slirp/tcp.h +++ b/slirp/tcp.h @@ -111,8 +111,14 @@ struct tcphdr { /* * User-settable options (used with setsockopt). + * + * We don't use the system headers on unix because we have conflicting + * local structures. We can't avoid the system definitions on Windows, + * so we undefine them. */ +#undef TCP_NODELAY #define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ +#undef TCP_MAXSEG /* #define TCP_MAXSEG 0x02 */ /* set maximum segment size */ /* |