diff options
| author | green <green@FreeBSD.org> | 2000-02-21 13:50:53 +0800 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2000-02-21 13:50:53 +0800 |
| commit | 49ac990a1e36d7868eed119efa93ed95edbecc79 (patch) | |
| tree | 0a2f7e508240d362a5b9d7c02264205c29261786 /net | |
| parent | 5d0d1ce8d4669eee642b5d6cead0611aea52ba46 (diff) | |
| download | freebsd-ports-gnome-49ac990a1e36d7868eed119efa93ed95edbecc79.tar.gz freebsd-ports-gnome-49ac990a1e36d7868eed119efa93ed95edbecc79.tar.zst freebsd-ports-gnome-49ac990a1e36d7868eed119efa93ed95edbecc79.zip | |
Try to fix socklen_t/int breakage for older 4.0s and for -STABLEs.
Diffstat (limited to 'net')
| -rw-r--r-- | net/licq-devel/files/patch-ad | 34 | ||||
| -rw-r--r-- | net/licq/files/patch-ad | 34 |
2 files changed, 68 insertions, 0 deletions
diff --git a/net/licq-devel/files/patch-ad b/net/licq-devel/files/patch-ad new file mode 100644 index 000000000000..c2a393881a6a --- /dev/null +++ b/net/licq-devel/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); diff --git a/net/licq/files/patch-ad b/net/licq/files/patch-ad new file mode 100644 index 000000000000..c2a393881a6a --- /dev/null +++ b/net/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); |