Commit 28d657fc0b790e7b338ba624074624e3ce1f457b
1 parent
4258b780
Fix build warning on Windows.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2270 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
6 additions
and
0 deletions
slirp/tcp.h
| @@ -111,8 +111,14 @@ struct tcphdr { | @@ -111,8 +111,14 @@ struct tcphdr { | ||
| 111 | 111 | ||
| 112 | /* | 112 | /* |
| 113 | * User-settable options (used with setsockopt). | 113 | * User-settable options (used with setsockopt). |
| 114 | + * | ||
| 115 | + * We don't use the system headers on unix because we have conflicting | ||
| 116 | + * local structures. We can't avoid the system definitions on Windows, | ||
| 117 | + * so we undefine them. | ||
| 114 | */ | 118 | */ |
| 119 | +#undef TCP_NODELAY | ||
| 115 | #define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ | 120 | #define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ |
| 121 | +#undef TCP_MAXSEG | ||
| 116 | /* #define TCP_MAXSEG 0x02 */ /* set maximum segment size */ | 122 | /* #define TCP_MAXSEG 0x02 */ /* set maximum segment size */ |
| 117 | 123 | ||
| 118 | /* | 124 | /* |