nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'neel/fbsd-cfix'

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-10 14:50:49 -04:00
commit 6711a172c0
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug26715 Normal file
View File

@ -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.

7
src/core/or/connection_edge.c
View File

@ -129,6 +129,13 @@
#endif #endif
#endif /* defined(HAVE_LINUX_NETFILTER_IPV6_IP6_TABLES_H) */ #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) #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)
#include <net/if.h> #include <net/if.h>
#include <net/pfvar.h> #include <net/pfvar.h>

12
src/lib/net/inaddr_st.h
View File

@ -13,9 +13,21 @@
#ifndef TOR_INADDR_ST_H #ifndef TOR_INADDR_ST_H
#define 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 #ifdef HAVE_NETINET_IN6_H
#include <netinet/in6.h> #include <netinet/in6.h>
#endif #endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>