diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-09 08:52:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-09 08:52:10 -0500 |
| commit | e6a44012001afb2d4c5956e4b55ccf6b622fd79e (patch) | |
| tree | 293ab440980e317c3d7fe99c67e24f9f155d05f9 /src/lib | |
| parent | a891d81c5f62cdda37b4371ebe2782e23e4f6db1 (diff) | |
| parent | 09472791d0ccf5b527a5b59eceb218aff38c2880 (diff) | |
| download | tor-e6a44012001afb2d4c5956e4b55ccf6b622fd79e.tar.gz tor-e6a44012001afb2d4c5956e4b55ccf6b622fd79e.zip | |
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/err/backtrace.c | 3 | ||||
| -rw-r--r-- | src/lib/net/inaddr_st.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index d18a595c34..b568c888c5 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -32,6 +32,9 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h index dc4c6e3a00..a6b7796268 100644 --- a/src/lib/net/inaddr_st.h +++ b/src/lib/net/inaddr_st.h @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef _WIN32 #include <winsock2.h> @@ -60,7 +63,7 @@ struct in6_addr /** @{ */ /** Many BSD variants seem not to define these. */ #if defined(__APPLE__) || defined(__darwin__) || \ - defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) #ifndef s6_addr16 #define s6_addr16 __u6_addr.__u6_addr16 #endif |