Fix building on NetBSD 9.0

Fixes #2310

Signed-off-by: gufe44 <gu981@protonmail.com>
This commit is contained in:
gufe44 2020-08-13 11:03:54 +02:00
parent a586099fd3
commit 19735b69b8
3 changed files with 16 additions and 2 deletions

View File

@ -0,0 +1,5 @@
Bugfix
* Fix building library/net_sockets.c and the ssl_mail_client program 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.
Adapted for long-term support branch 2.16 in #3558.

View File

@ -51,6 +51,10 @@
* Harmless on other platforms. */ * Harmless on other platforms. */
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#if defined(__NetBSD__)
#define _XOPEN_SOURCE 600 /* sockaddr_storage */
#endif
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h" #include "mbedtls/config.h"
#else #else
@ -345,8 +349,9 @@ int mbedtls_net_accept( mbedtls_net_context *bind_ctx,
struct sockaddr_storage client_addr; struct sockaddr_storage client_addr;
#if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \ #if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \
defined(_SOCKLEN_T_DECLARED) || 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 n = (socklen_t) sizeof( client_addr );
socklen_t type_len = (socklen_t) sizeof( type ); socklen_t type_len = (socklen_t) sizeof( type );
#else #else

View File

@ -51,6 +51,10 @@
* Harmless on other platforms. */ * Harmless on other platforms. */
#define _POSIX_C_SOURCE 200112L #define _POSIX_C_SOURCE 200112L
#if defined(__NetBSD__)
#define _XOPEN_SOURCE 600
#endif
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h" #include "mbedtls/config.h"
#else #else