1 files changed, 8 insertions, 24 deletions

diff --git a/toxcore/network.h b/toxcore/network.h
index 8a0e20dc..1253c07e 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -40,14 +40,11 @@
 #include <ws2tcpip.h>
 
 typedef unsigned int sock_t;
-typedef INT sa_family_t;
-
-#ifndef IN6_ARE_ADDR_EQUAL
-#define IN6_ARE_ADDR_EQUAL(a,b) \
-    ((((__const uint32_t *) (a))[0] == ((__const uint32_t *) (b))[0]) \
-  && (((__const uint32_t *) (a))[1] == ((__const uint32_t *) (b))[1]) \
-  && (((__const uint32_t *) (a))[2] == ((__const uint32_t *) (b))[2]) \
-  && (((__const uint32_t *) (a))[3] == ((__const uint32_t *) (b))[3]))
+/* sa_family_t is the sockaddr_in / sockaddr_in6 family field */
+typedef short sa_family_t;
+
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
 #endif
 
 #else // Linux includes
@@ -103,7 +100,6 @@ typedef int sock_t;
 /* Current time, unix format */
 #define unix_time() ((uint64_t)time(NULL))
 
-
 typedef union {
     uint8_t uint8[4];
     uint16_t uint16[2];
@@ -124,7 +120,7 @@ typedef struct {
         IP4 ip4;
         IP6 ip6;
     };
-} IPAny;
+} IP;
 
 typedef union {
     struct {
@@ -136,24 +132,12 @@ typedef union {
     uint8_t uint8[8];
 } IP4_Port;
 
-/* will replace IP_Port as soon as the complete infrastructure is in place
- * removed the unused union and padding also */
 typedef struct {
-    IPAny ip;
+    IP ip;
     uint16_t port;
-} IPAny_Port;
+} IP_Port;
 
-/* #undef TOX_ENABLE_IPV6 */
-#define TOX_ENABLE_IPV6
-#ifdef TOX_ENABLE_IPV6
 #define TOX_ENABLE_IPV6_DEFAULT 1
-typedef IPAny IP;
-typedef IPAny_Port IP_Port;
-#else
-#define TOX_ENABLE_IPV6_DEFAULT 0
-typedef IP4 IP;
-typedef IP4_Port IP_Port;
-#endif
 
 /* ip_ntoa
  *   converts ip into a string