commit 6711a172c0b8cca96843c14d0721fd8b48034956 Merge: 422abd4fa 6d58c20d9 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 10 14:50:49 2018 -0400
Merge remote-tracking branch 'neel/fbsd-cfix'
changes/bug26715 | 5 +++++ src/core/or/connection_edge.c | 7 +++++++ src/lib/net/inaddr_st.h | 12 ++++++++++++ 3 files changed, 24 insertions(+)
diff --cc src/lib/net/inaddr_st.h index cc72621e9,fd3fc12ba..dc4c6e3a0 --- a/src/lib/net/inaddr_st.h +++ b/src/lib/net/inaddr_st.h @@@ -3,20 -3,23 +3,32 @@@ * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */
-#ifndef TOR_IPV6_H -#define TOR_IPV6_H +/** + * \file inaddr_st.h + * + * \brief Define in6_addr, its members, and related types on platforms that + * lack it. + **/ + +#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> #include <ws2tcpip.h>