From: ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 23 Dec 2006 00:03:15 +0000 (+0000)
Subject: Fix build warning on Windows.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=28d657fc0b790e7b338ba624074624e3ce1f457b;p=qemu.git

Fix build warning on Windows.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2270 c046a42c-6fe2-441c-8c8c-71466251a162
---

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 */
 
 /*