diff options
| author | Brian Feldman <green@FreeBSD.org> | 2000-02-21 05:50:53 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2000-02-21 05:50:53 +0000 |
| commit | e21ad16debb952a32c415de88aa61bd93e6abb5b (patch) | |
| tree | 3a1ef8eb8d40424f5dcc938bdf915266775d744f /net-im/licq/files | |
| parent | Cannot view gzipped info files if the next line is in ~/.emacs: (diff) | |
Try to fix socklen_t/int breakage for older 4.0s and for -STABLEs.
Notes
Notes:
svn path=/head/; revision=26077
Diffstat (limited to 'net-im/licq/files')
| -rw-r--r-- | net-im/licq/files/patch-ad | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/net-im/licq/files/patch-ad b/net-im/licq/files/patch-ad new file mode 100644 index 000000000000..c2a393881a6a --- /dev/null +++ b/net-im/licq/files/patch-ad @@ -0,0 +1,34 @@ +--- src/daemon/socket.cpp.orig Mon Feb 21 00:34:58 2000 ++++ src/daemon/socket.cpp Mon Feb 21 00:43:15 2000 +@@ -12,6 +12,7 @@ + #include <netdb.h> + #include <fcntl.h> + #include <unistd.h> ++#include <osreldate.h> + + #ifndef MSG_DONTWAIT + #define MSG_DONTWAIT 0 +@@ -244,7 +245,11 @@ + if (_nFlags & ADDR_LOCAL) + { + // Setup the local structure ++#if __FreeBSD_version < 400013 ++ int sizeofSockaddr = sizeof(struct sockaddr_in); ++#else + socklen_t sizeofSockaddr = sizeof(struct sockaddr_in); ++#endif + if (getsockname(m_nDescriptor, (struct sockaddr *)&m_sLocalAddr, &sizeofSockaddr) < 0) + { + // errno has been set +@@ -480,7 +485,11 @@ + *---------------------------------------------------------------------------*/ + void TCPSocket::RecvConnection(TCPSocket &newSocket) + { ++#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.OpenSocket(); + newSocket.SetAddrsFromSocket(ADDR_LOCAL | ADDR_REMOTE); |