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

changes/bug26715

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

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>

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>