diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2002-02-07 14:17:09 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2002-02-07 14:17:09 +0000 |
| commit | 13518aacca71f6fa98ffd2023d6b87fc7d456233 (patch) | |
| tree | c962a782d4dde58bdbc2adfc3afc27f79aee411b /net/licq-devel/files/patch-ad | |
| parent | Update to 1.2.1. (diff) | |
Port for licq 1.1.0 devel 2002-01-28 snapshot (repo-copied from `licq' port).
Most important new feature is ICQv8 support (works for me).
`licq-qt-gui' and `licq-console' ports will be altered soon to add
ability to build with this port instead of `licq'.
Notes
Notes:
svn path=/head/; revision=54313
Diffstat (limited to '')
| -rw-r--r-- | net/licq-devel/files/patch-ad | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/net/licq-devel/files/patch-ad b/net/licq-devel/files/patch-ad index 7bf734c85ce6..d66ba556ec8c 100644 --- a/net/licq-devel/files/patch-ad +++ b/net/licq-devel/files/patch-ad @@ -1,27 +1,23 @@ ---- src/socket.cpp.orig Tue Jul 4 20:51:50 2000 -+++ src/socket.cpp Mon Jul 24 03:32:56 2000 -@@ -12,6 +12,7 @@ +--- src/socket.cpp.orig Fri Jan 4 16:25:00 2002 ++++ src/socket.cpp Mon Jan 28 15:15:22 2002 +@@ -13,6 +13,7 @@ #include <netdb.h> #include <fcntl.h> #include <unistd.h> +#include <osreldate.h> - #ifndef MSG_DONTWAIT - #define MSG_DONTWAIT 0 -@@ -288,7 +289,12 @@ - bool INetSocket::SetLocalAddress(bool bIp) - { + #ifdef HAVE_INET_ATON + #include <arpa/inet.h> +@@ -294,6 +295,8 @@ // Setup the local structure -+ -+#if __FreeBSD_version < 400013 + #ifdef USE_SOCKS5 + int sizeofSockaddr = sizeof(struct sockaddr_in); ++#elif __FreeBSD_version < 400013 + int sizeofSockaddr = sizeof(struct sockaddr_in); -+#else + #else socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); -+#endif - if (getsockname(m_nDescriptor, (struct sockaddr *)&m_sLocalAddr, &sizeofSockaddr) < 0) - { - m_nErrorType = SOCK_ERROR_errno; -@@ -372,7 +378,11 @@ + #endif +@@ -380,7 +383,11 @@ m_sRemoteAddr.sin_family = AF_INET; // if connect fails then call CloseConnection to clean up before returning @@ -33,16 +29,12 @@ if (connect(m_nDescriptor, (struct sockaddr *)&m_sRemoteAddr, sizeofSockaddr) < 0) { // errno has been set -@@ -504,7 +514,11 @@ - *---------------------------------------------------------------------------*/ +@@ -640,6 +647,8 @@ void TCPSocket::RecvConnection(TCPSocket &newSocket) { -- socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); -+#if __FreeBSD_version < 400013 -+ int sizeofSockaddr = sizeof(struct sockaddr_in); -+#else -+ socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); -+#endif - newSocket.m_nDescriptor = accept(m_nDescriptor, (struct sockaddr *)&newSocket.m_sRemoteAddr, &sizeofSockaddr); - newSocket.SetLocalAddress(); - } + #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); |