Merge pull request #3570 from gufe44/net-sockets-fixes-2.7

[Backport 2.7] NetBSD 9.0 build fixes
This commit is contained in:
Manuel Pégourié-Gonnard 2020-08-18 09:13:52 +02:00 committed by GitHub
commit 30c1df3f84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View file

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

View file

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