diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-10 14:50:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-10 14:50:49 -0400 |
| commit | 6711a172c0b8cca96843c14d0721fd8b48034956 (patch) | |
| tree | cf230f09668f9b5343915ffdb77669943872ee27 | |
| parent | 422abd4fa3c2c9c10f4e7f83eced7416785e89c4 (diff) | |
| parent | 6d58c20d944b7b9056fc260f29452d2627b3e9f5 (diff) | |
| download | tor-6711a172c0b8cca96843c14d0721fd8b48034956.tar.gz tor-6711a172c0b8cca96843c14d0721fd8b48034956.zip | |
Merge remote-tracking branch 'neel/fbsd-cfix'
| -rw-r--r-- | changes/bug26715 | 5 | ||||
| -rw-r--r-- | src/core/or/connection_edge.c | 7 | ||||
| -rw-r--r-- | src/lib/net/inaddr_st.h | 12 |
3 files changed, 24 insertions, 0 deletions
diff --git a/changes/bug26715 b/changes/bug26715 new file mode 100644 index 0000000000..85fc9d1ed4 --- /dev/null +++ b/changes/bug26715 @@ -0,0 +1,5 @@ + o Major bugfixes (compilation): + - Include additional headers in connection_edge.c and ipv6.h in order + to build correctly on FreeBSD post-refactor. Fixes bug 26715; bugfix + on 0.3.5.1-alpha. Patch by Neel Chauhan. + diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 8e8a5e21ca..c51e428000 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -129,6 +129,13 @@ #endif #endif /* defined(HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H) */ +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif + #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #include <net/if.h> #include <net/pfvar.h> diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h index cc72621e99..dc4c6e3a00 100644 --- a/src/lib/net/inaddr_st.h +++ b/src/lib/net/inaddr_st.h @@ -13,9 +13,21 @@ #ifndef TOR_INADDR_ST_H #define TOR_INADDR_ST_H +#include "orconfig.h" +#include <stddef.h> + +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #ifdef HAVE_NETINET_IN6_H #include <netinet/in6.h> #endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef _WIN32 #include <winsock2.h> |