Portability

diff --git a/tcp.h b/tcp.h
index 19ad1c0a57798d095b13b02a5ef9901e2bb2f1b3..0ecba21e3cfe56d82ee070aeecc4b1230958dc2e 100644 (file)
--- a/tcp.h
+++ b/tcp.h
@@ -26,15 +26,21 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <ctype.h>
+
+#ifndef WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <unistd.h>
-#include <sys/socket.h>
 #include <arpa/inet.h>
-#include <fcntl.h>
-#include <ctype.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#else
+#include <winsock2.h>
+#include <errno.h>
+#include <Ws2tcpip.h>
+#endif
 
 #include "defines.h"
 #include "log.h"

diff --git a/viewman.h b/viewman.h
index 5b4643a88e4000e071bf8278fdb3a0187ab84d74..006e07dceb10315d223307212ba039d9fc019d0d 100644 (file)
--- a/viewman.h
+++ b/viewman.h
@@ -24,9 +24,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <signal.h>
-
-// might need <ext/slist> for newer compilers?
-#include <slist>
+#include <list>
 
 #include "defines.h"
 #include "view.h"
@@ -40,7 +38,7 @@
 
 //using namespace __gnu_cxx; // needed for newer compilers?
 
-typedef slist<Region> RegionList;
+typedef list<Region> RegionList;
 
 class ViewMan : public MessageQueue
 {