Cleanup, mostly network threading madness. Statusbar is now created at hard reset, IF the configuration has changed. Other minor things.

src/network/slirp/debug.c

@@ -6,7 +6,7 @@
  * terms and conditions of the copyright.
  */
 
-#ifndef WIN32
+#ifndef _WIN32
 # include <unistd.h>
 #endif
 #include "slirp.h"

src/network/slirp/misc.c

@@ -7,7 +7,7 @@
 
 #define WANT_SYS_IOCTL_H
 #include <stdlib.h>
-#ifndef WIN32
+#ifndef _WIN32
 # include <unistd.h>
 #endif
 #include "slirp.h"
@@ -223,12 +223,6 @@ add_exec(ex_ptr, do_pty, exec, addr, port)
 /*
  * For systems with no strerror
  */
-
-#ifdef WIN32
-//extern int sys_nerr;
-//extern char *sys_errlist[];
-#endif
-
 char *
 SLIRPstrerror(error)
 	int error;

src/network/slirp/socket.c

@@ -7,7 +7,7 @@
 
 #define WANT_SYS_IOCTL_H
 #include <stdlib.h>
-#ifndef WIN32
+#ifndef _WIN32
 # include <unistd.h>
 #endif
 #include "slirp.h"

src/network/slirp/tcp_subr.c

@@ -40,7 +40,7 @@
 
 #define WANT_SYS_IOCTL_H
 #include <stdlib.h>
-#ifndef WIN32
+#ifndef _WIN32
 # include <unistd.h>
 #endif
 #include "slirp.h"

src/network/slirp/udp.c

@@ -39,7 +39,7 @@
  */
 
 #include <stdlib.h>
-#ifndef WIN32
+#ifndef _WIN32
 # include <unistd.h>
 #endif
 #include "slirp.h"