diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-08-09 18:42:48 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-08-09 18:42:48 +0000 |
commit | d4e17048ac1ae92b07dd0d5380ee30376b06abe5 (patch) | |
tree | 4683561c6e58883656902a1f7896ee2dd9e6eeed /net-im/licq/files/patch-socket.cpp | |
parent | Update to 1.26.r4 (diff) |
Update to 1.2.0a
Submitted by: fjoe,brad@brad-x.com
Notes
Notes:
svn path=/head/; revision=64294
Diffstat (limited to '')
-rw-r--r-- | net-im/licq/files/patch-socket.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/net-im/licq/files/patch-socket.cpp b/net-im/licq/files/patch-socket.cpp new file mode 100644 index 000000000000..4d39b2ff7103 --- /dev/null +++ b/net-im/licq/files/patch-socket.cpp @@ -0,0 +1,40 @@ +--- src/socket.cpp.orig Tue Jul 23 12:22:13 2002 ++++ src/socket.cpp Thu Aug 8 03:07:32 2002 +@@ -13,6 +13,7 @@ + #include <netdb.h> + #include <fcntl.h> + #include <unistd.h> ++#include <osreldate.h> + + #ifdef HAVE_INET_ATON + #include <arpa/inet.h> +@@ -304,6 +305,8 @@ + // Setup the local structure + #ifdef USE_SOCKS5 + int sizeofSockaddr = sizeof(struct sockaddr_in); ++#elif __FreeBSD_version < 400013 ++ int sizeofSockaddr = sizeof(struct sockaddr_in); + #else + socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); + #endif +@@ -416,7 +419,11 @@ + m_sRemoteAddr.sin_family = AF_INET; + + // if connect fails then call CloseConnection to clean up before returning ++#if __FreeBSD_version < 400013 ++ int sizeofSockaddr = sizeof(struct sockaddr); ++#else + socklen_t sizeofSockaddr = sizeof(struct sockaddr); ++#endif + if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0) + { + // errno has been set +@@ -691,6 +698,8 @@ + void TCPSocket::RecvConnection(TCPSocket &newSocket) + { + #ifdef USE_SOCKS5 ++ int sizeofSockaddr = sizeof(struct sockaddr_in); ++#elif __FreeBSD_version < 400013 + int sizeofSockaddr = sizeof(struct sockaddr_in); + #else + socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); |