Index: /trunk/src/VBox/Devices/Network/lwip/src/api/sockets.c
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip/src/api/sockets.c	(revision 30219)
+++ /trunk/src/VBox/Devices/Network/lwip/src/api/sockets.c	(revision 30220)
@@ -34,5 +34,7 @@
 
 #include <string.h>
-#include <errno.h>
+#ifndef _MSC_VER /* Why is errno.h included here - see lwip/arch.h -> lwip/cc.h */
+# include <errno.h>
+#endif
 
 #include "lwip/opt.h"
@@ -97,4 +99,7 @@
 #ifdef ERRNO
 #define set_errno(err) errno = (err)
+# ifdef _MSC_VER
+#  error "Curious bird: Where is ERRNO defined for MSC?"
+# endif
 #else
 #define set_errno(err)
@@ -984,9 +989,9 @@
   /* Do length and type checks for the various options first, to keep it readable. */
   switch( level ) {
-   
+
 /* Level: SOL_SOCKET */
   case SOL_SOCKET:
       switch(optname) {
-         
+
       case SO_ACCEPTCONN:
       case SO_BROADCAST:
@@ -1016,5 +1021,5 @@
       }  /* switch */
       break;
-                     
+
 /* Level: IPPROTO_IP */
   case IPPROTO_IP:
@@ -1035,5 +1040,5 @@
       }  /* switch */
       break;
-         
+
 /* Level: IPPROTO_TCP */
   case IPPROTO_TCP:
@@ -1042,5 +1047,5 @@
         break;
     }
-      
+
       /* If this is no TCP socket, ignore any options. */
       if ( sock->conn->type != NETCONN_TCP ) return 0;
@@ -1050,5 +1055,5 @@
       case TCP_KEEPALIVE:
         break;
-         
+
       default:
         LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, UNIMPL: optname=0x%x, ..)\n", s, optname));
@@ -1063,10 +1068,10 @@
   }  /* switch */
 
-   
+
   if( 0 != err ) {
     sock_set_errno(sock, err);
     return -1;
   }
-   
+
 
 
@@ -1074,5 +1079,5 @@
 
   switch(level) {
-   
+
 /* Level: SOL_SOCKET */
   case SOL_SOCKET:
@@ -1243,5 +1248,5 @@
     break;
 
-/* UNDEFINED LEVEL */      
+/* UNDEFINED LEVEL */
   default:
     LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, level=0x%x, UNIMPL: optname=0x%x, ..)\n", s, level, optname));