The branch master has been updated via b9b211fcb6b9068ef1d8729a4971fbe693fd2cde (commit) from 5719dd461fc2cc5d5d29fc3d7e9a6deca3130a7e (commit)
- Log ----------------------------------------------------------------- commit b9b211fcb6b9068ef1d8729a4971fbe693fd2cde Author: Juan Manuel Guerrero <juan.guerr...@gmx.de> Date: Wed Feb 2 00:41:02 2022 +0100 Fix builds with DJGPP CLA: trivial To get the master branch compiled with DJGPP some minor adjustments are required. They will have no impact on any other ports. The DJGPP port uses the Watt-32 library to provide the required network functionality and some of its headers need to be included. Neither DJGPP nor the Watt-32 library provide in_addr_t thus it must be provided as it is done for OPENSSL_SYS_WINDOWS in crypto/bio/b_addr.c. In the DJGPP section of include/internal/sockets.h the following Watt-32 headers must be added: - arpa/inet.h: to provide declaration of inet_ntoa required in crypto/bio/b_addr.c - netinet/tcp.h: to provide defintion of TCP_NODELAY required in crypto/bio/b_sock2.c Reviewed-by: Matt Caswell <m...@openssl.org> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17623) ----------------------------------------------------------------------- Summary of changes: crypto/bio/bio_addr.c | 2 +- include/internal/sockets.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/bio/bio_addr.c b/crypto/bio/bio_addr.c index dd180387e6..8c7139691b 100644 --- a/crypto/bio/bio_addr.c +++ b/crypto/bio/bio_addr.c @@ -752,7 +752,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, # pragma pointer_size 32 #endif /* Windows doesn't seem to have in_addr_t */ -#ifdef OPENSSL_SYS_WINDOWS +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) static uint32_t he_fallback_address; static const char *he_fallback_addresses[] = { (char *)&he_fallback_address, NULL }; diff --git a/include/internal/sockets.h b/include/internal/sockets.h index 6e882fa6aa..b3e42e04d1 100644 --- a/include/internal/sockets.h +++ b/include/internal/sockets.h @@ -32,6 +32,8 @@ # include <sys/un.h> # include <tcp.h> # include <netdb.h> +# include <arpa/inet.h> +# include <netinet/tcp.h> # elif defined(_WIN32_WCE) && _WIN32_WCE<410 # define getservbyname _masked_declaration_getservbyname # endif