blob: 36d9f1d9f5850be89a6687f3fcb5fa8b49b21f72 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- src/socket.cpp.orig Thu Jan 2 22:08:06 2003
+++ src/socket.cpp Wed Jan 8 07:58:47 2003
@@ -13,6 +13,9 @@
#include <netdb.h>
#include <fcntl.h>
#include <unistd.h>
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#endif
#ifdef HAVE_INET_ATON
#include <arpa/inet.h>
@@ -427,7 +430,11 @@
m_sRemoteAddr.sin_family = AF_INET;
// if connect fails then call CloseConnection to clean up before returning
+#if defined(__FreeBSD__) && __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
--- src/socket.cpp.orig Wed Jan 29 13:19:59 2003
+++ src/socket.cpp Wed Jan 29 13:20:20 2003
@@ -42,7 +42,6 @@
#ifdef USE_SOCKS5
#define SOCKS
-#define INCLUDE_PROTOTYPES
extern "C" {
#include <socks.h>
}
|