From 3ca3b9ea88c2022cf225eeb717b6f692702e21e1 Mon Sep 17 00:00:00 2001 From: gufe44 Date: Mon, 17 Aug 2020 07:14:16 +0200 Subject: [PATCH] Fix building on NetBSD 9.0 Fixes #2310 Signed-off-by: gufe44 --- ChangeLog.d/fix-build-netbsd.txt | 5 +++++ library/net_sockets.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 ChangeLog.d/fix-build-netbsd.txt diff --git a/ChangeLog.d/fix-build-netbsd.txt b/ChangeLog.d/fix-build-netbsd.txt new file mode 100644 index 000000000..ac768343e --- /dev/null +++ b/ChangeLog.d/fix-build-netbsd.txt @@ -0,0 +1,5 @@ +Bugfix + * Fix building library/net_sockets.c on NetBSD. NetBSD conditionals were + added for the backport to avoid the risk of breaking a platform. Original + fix contributed by Nia Alarie in #3422. Adopted for long-term support + branch 2.7 in #3570. diff --git a/library/net_sockets.c b/library/net_sockets.c index 7a5691700..749199a20 100644 --- a/library/net_sockets.c +++ b/library/net_sockets.c @@ -335,8 +335,9 @@ int mbedtls_net_accept( mbedtls_net_context *bind_ctx, struct sockaddr_storage client_addr; -#if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \ - defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t) +#if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \ + defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t) || \ + ( defined(__NetBSD__) && defined(socklen_t) ) socklen_t n = (socklen_t) sizeof( client_addr ); socklen_t type_len = (socklen_t) sizeof( type ); #else