From 872362bd3e332edc8213b82ddb32d99dddc6558b Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 26 Jun 2013 15:32:20 +0000 Subject: [PATCH] fix bind call in more recent msvc versions --- panda/src/nativenet/socket_portable.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/nativenet/socket_portable.h b/panda/src/nativenet/socket_portable.h index a794865641..4d76be5b24 100755 --- a/panda/src/nativenet/socket_portable.h +++ b/panda/src/nativenet/socket_portable.h @@ -79,7 +79,7 @@ inline SOCKET DO_NEWTCP() } inline int DO_BIND(const SOCKET a, const sockaddr_in *b) { - return bind(a, reinterpret_cast(b), sizeof(sockaddr)); + return ::bind(a, reinterpret_cast(b), sizeof(sockaddr)); } inline int DO_CLOSE(const SOCKET a) { @@ -179,7 +179,7 @@ inline int DO_SOCKET_WRITE(const SOCKET a, const char * buff, const int len) //#define DO_SOCKET_WRITE_TO(a,b,c,d) sendto(a,b,c,0,(sockaddr *)d,sizeof(sockaddr)) //#define DO_NEWUDP() socket(AF_INET, SOCK_DGRAM, 0) //#define DO_NEWTCP() socket(AF_INET, SOCK_STREAM, 0) -//#define DO_BIND(a,b) bind(a,(sockaddr *)b,sizeof(sockaddr)) +//#define DO_BIND(a,b) ::bind(a,(sockaddr *)b,sizeof(sockaddr)) //#/define DO_CLOSE(a) close(a) inline int DO_SOCKET_WRITE_TO(const SOCKET a, const char * buffer, const int buf_len, const sockaddr_in * addr) { @@ -195,7 +195,7 @@ inline SOCKET DO_NEWTCP() } inline int DO_BIND(const SOCKET a, const sockaddr_in *b) { - return bind(a, reinterpret_cast(b), sizeof(sockaddr)); + return ::bind(a, reinterpret_cast(b), sizeof(sockaddr)); } inline int DO_CLOSE(const SOCKET a) { @@ -300,7 +300,7 @@ inline SOCKET DO_NEWTCP() } inline int DO_BIND(const SOCKET a, const sockaddr_in *b) { - return bind(a, reinterpret_cast(b), sizeof(sockaddr)); + return ::bind(a, reinterpret_cast(b), sizeof(sockaddr)); } inline int DO_CLOSE(const SOCKET a) {