From: FdaSilvaYY <fdasilvayy@gmail.com>
Date: Sat, 20 Feb 2021 23:10:07 +0000 (+0100)
Subject: crypto: fix missing <winsock.h> indirection inclusion.
X-Git-Tag: openssl-3.5.0-alpha1~1186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0022bc81a9408a82557f0af33852246d60ea48d3;p=thirdparty%2Fopenssl.git

crypto: fix missing <winsock.h> indirection inclusion.

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14344)
---

diff --git a/crypto/bio/bio_sock.c b/crypto/bio/bio_sock.c
index ea28fd2826d..a4c479503fc 100644
--- a/crypto/bio/bio_sock.c
+++ b/crypto/bio/bio_sock.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "bio_local.h"
+
 #ifndef OPENSSL_NO_SOCK
 # define SOCKET_PROTOCOL IPPROTO_TCP
 # ifdef SO_MAXCONN
@@ -38,6 +39,7 @@ static int wsa_init_done = 0;
 #   include <sys/select.h>
 #  endif
 # endif
+# include "internal/sockets.h" /* for openssl_fdset() */
 
 # ifndef OPENSSL_NO_DEPRECATED_1_1_0
 int BIO_get_host_ip(const char *str, unsigned char *ip)
diff --git a/crypto/time.c b/crypto/time.c
index b0593a238bd..a6ab6cd1272 100644
--- a/crypto/time.c
+++ b/crypto/time.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <openssl/err.h>
 #include "internal/time.h"
+#include "internal/e_os.h"
 
 OSSL_TIME ossl_time_now(void)
 {
diff --git a/include/internal/bio_addr.h b/include/internal/bio_addr.h
index a6449b7eb05..072f404a2c5 100644
--- a/include/internal/bio_addr.h
+++ b/include/internal/bio_addr.h
@@ -11,6 +11,7 @@
 # define OSSL_BIO_ADDR_H
 
 # include "internal/e_os.h"
+# include "internal/e_winsock.h"
 # include "internal/sockets.h"
 
 # ifndef OPENSSL_NO_SOCK
diff --git a/include/internal/time.h b/include/internal/time.h
index 14d724abf5a..140dc1f3388 100644
--- a/include/internal/time.h
+++ b/include/internal/time.h
@@ -12,7 +12,8 @@
 # pragma once
 
 # include <openssl/e_os2.h>     /* uint64_t */
-# include "internal/e_os.h"     /* for struct timeval */
+# include "internal/e_os.h"
+# include "internal/e_winsock.h" /* for struct timeval */
 # include "internal/safe_math.h"
 
 /*