build fixes for VS 2010

bittorrent · May 28, 2010 · bc59ac7 · bc59ac7
1 parent 4e3f400
commit bc59ac7
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 31 deletions.
diff --git a/utp.cpp b/utp.cpp
@@ -7,17 +7,21 @@
 #include <assert.h>
 #include <string.h>
 #include <string.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <limits.h> // for UINT_MAX
 
 #ifdef WIN32
 #include "win32_inet_ntop.h"
 
+// newer versions of MSVC define these in errno.h
+#ifndef ECONNRESET
 #define ECONNRESET WSAECONNRESET
 #define EMSGSIZE WSAEMSGSIZE
 #define ECONNREFUSED WSAECONNREFUSED
 #define ETIMEDOUT WSAETIMEDOUT
 #endif
+#endif
 
 #ifdef POSIX
 typedef sockaddr_storage SOCKADDR_STORAGE;
@@ -191,13 +195,13 @@ struct PackedSockAddr {
 		const byte family = get_family();
 		str i;
 		if (family == AF_INET) {
-			inet_ntop(family, &_sin4, s, len);
+			inet_ntop(family, (uint32*)&_sin4, s, len);
 			i = s;
 			while (*++i) {}
 		} else {
 			i = s;
 			*i++ = '[';
-			inet_ntop(family, &_in._in6addr, i, len-1);
+			inet_ntop(family, (in6_addr*)&_in._in6addr, i, len-1);
 			while (*++i) {}
 			*i++ = ']';
 		}

diff --git a/utp_file/utp_recv.cpp b/utp_file/utp_recv.cpp
@@ -3,14 +3,6 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#ifdef WIN32
-#define ECONNRESET WSAECONNRESET
-#define EMSGSIZE WSAEMSGSIZE
-#define ECONNREFUSED WSAECONNREFUSED
-#define ECONNRESET WSAECONNRESET
-#define ETIMEDOUT WSAETIMEDOUT
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -19,6 +11,17 @@
 #include <assert.h>
 #include <errno.h>
 
+#ifdef WIN32
+// newer versions of MSVC define these in errno.h
+#ifndef ECONNRESET
+#define ECONNRESET WSAECONNRESET
+#define EMSGSIZE WSAEMSGSIZE
+#define ECONNREFUSED WSAECONNREFUSED
+#define ECONNRESET WSAECONNRESET
+#define ETIMEDOUT WSAETIMEDOUT
+#endif
+#endif
+
 // platform-specific includes
 #ifdef POSIX
 #include <unistd.h>
@@ -152,7 +155,7 @@ SOCKET make_socket(const struct sockaddr *addr, socklen_t addrlen)
 	if (bind(s, addr, addrlen) < 0) {
 		char str[20];
 		printf("UDP port bind failed %s: (%d) %s\n",
-			   inet_ntop(addr->sa_family, addr, str, sizeof(str)), errno, strerror(errno));
+			   inet_ntop(addr->sa_family, (sockaddr*)addr, str, sizeof(str)), errno, strerror(errno));
 		closesocket(s);
 		return INVALID_SOCKET;
 	}

diff --git a/utp_file/utp_send.cpp b/utp_file/utp_send.cpp
@@ -3,14 +3,6 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#ifdef WIN32
-#define ECONNRESET WSAECONNRESET
-#define EMSGSIZE WSAEMSGSIZE
-#define ECONNREFUSED WSAECONNREFUSED
-#define ECONNRESET WSAECONNRESET
-#define ETIMEDOUT WSAETIMEDOUT
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -19,6 +11,17 @@
 #include <assert.h>
 #include <errno.h>
 
+#ifdef WIN32
+// newer versions of MSVC define these in errno.h
+#ifndef ECONNRESET
+#define ECONNRESET WSAECONNRESET
+#define EMSGSIZE WSAEMSGSIZE
+#define ECONNREFUSED WSAECONNREFUSED
+#define ECONNRESET WSAECONNRESET
+#define ETIMEDOUT WSAETIMEDOUT
+#endif
+#endif
+
 // platform-specific includes
 #ifdef POSIX
 #include <unistd.h>
@@ -152,7 +155,7 @@ SOCKET make_socket(const struct sockaddr *addr, socklen_t addrlen)
 	if (bind(s, addr, addrlen) < 0) {
 		char str[20];
 		printf("UDP port bind failed %s: (%d) %s\n",
-			   inet_ntop(addr->sa_family, addr, str, sizeof(str)), errno, strerror(errno));
+			   inet_ntop(addr->sa_family, (sockaddr*)addr, str, sizeof(str)), errno, strerror(errno));
 		closesocket(s);
 		return INVALID_SOCKET;
 	}

diff --git a/utp_test/utp_test.cpp b/utp_test/utp_test.cpp
@@ -3,14 +3,6 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#ifdef WIN32
-#define ECONNRESET WSAECONNRESET
-#define EMSGSIZE WSAEMSGSIZE
-#define ECONNREFUSED WSAECONNREFUSED
-#define ECONNRESET WSAECONNRESET
-#define ETIMEDOUT WSAETIMEDOUT
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -19,6 +11,17 @@
 #include <assert.h>
 #include <errno.h>
 
+#ifdef WIN32
+// newer versions of MSVC define these in errno.h
+#ifndef ECONNRESET
+#define ECONNRESET WSAECONNRESET
+#define EMSGSIZE WSAEMSGSIZE
+#define ECONNREFUSED WSAECONNREFUSED
+#define ECONNRESET WSAECONNRESET
+#define ETIMEDOUT WSAETIMEDOUT
+#endif
+#endif
+
 // platform-specific includes
 #ifdef POSIX
 #include <unistd.h>
@@ -165,7 +168,7 @@ SOCKET make_socket(const struct sockaddr *addr, socklen_t addrlen)
 	if (bind(s, addr, addrlen) < 0) {
 		char str[20];
 		printf("UDP port bind failed %s: (%d) %s\n",
-			   inet_ntop(addr->sa_family, addr, str, sizeof(str)), errno, strerror(errno));
+			   inet_ntop(addr->sa_family, (sockaddr*)addr, str, sizeof(str)), errno, strerror(errno));
 		closesocket(s);
 		return INVALID_SOCKET;
 	}
@@ -197,7 +200,6 @@ void UDPSocketManager::set_socket(SOCKET s)
 	if (_socket != INVALID_SOCKET) closesocket(_socket);
 	assert(s != INVALID_SOCKET);
 	_socket = s;
-
 }
 
 void send_to(void *userdata, const byte *p, size_t len, const struct sockaddr *to, socklen_t tolen)
@@ -499,4 +501,3 @@ int main(int argc, char* argv[])
 
 	fclose(log_file);
 }
-
diff --git a/utp_utils.cpp b/utp_utils.cpp
@@ -2,6 +2,7 @@
 
 #include "utypes.h"
 #include <assert.h>
+#include <stdlib.h>
 
 #ifdef WIN32