Index: /trunk/src/VBox/Devices/Network/slirp/tcp.h
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/tcp.h	(revision 477)
+++ /trunk/src/VBox/Devices/Network/slirp/tcp.h	(revision 478)
@@ -121,6 +121,12 @@
 /*
  * 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.
  */
-/* #define	TCP_NODELAY	0x01 */	/* don't delay send to coalesce packets */
+#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 */
 
Index: /trunk/src/VBox/Devices/Network/slirp/tcp_subr.c
===================================================================
--- /trunk/src/VBox/Devices/Network/slirp/tcp_subr.c	(revision 477)
+++ /trunk/src/VBox/Devices/Network/slirp/tcp_subr.c	(revision 478)
@@ -504,5 +504,7 @@
 	opt = 1;
 	setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
-	
+        opt = 1;
+        setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int));
+
 	so->so_fport = addr.sin_port;
 	so->so_faddr = addr.sin_addr;