From 1042755f7f16c9f39869adecb1105f2a4f50710e Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Wed, 8 Nov 2023 12:28:00 +0100
Subject: [PATCH] [windows] Less number of warnings

---
 config2.h.in                    |  3 +++
 meson.build                     |  4 ++++
 src/intl/gettext/localcharset.c |  3 +++
 src/osdep/win32/overrides.h     |  5 ++++-
 src/osdep/win32/sysinfo.h       | 23 +++++++++++++++++++++++
 src/osdep/win32/vt100.h         |  4 ++++
 src/osdep/win32/win32.c         |  7 +++++++
 7 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/config2.h.in b/config2.h.in
index 8cbb4749..41f2552a 100644
--- a/config2.h.in
+++ b/config2.h.in
@@ -831,6 +831,9 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #mesondefine HAVE_WINDOWS_H
 
+/* Define to 1 if you have the <winsock2.h> header file. */
+#mesondefine HAVE_WINSOCK2_H
+
 /* Define to 1 if you have the <ws2tcpip.h> header file. */
 #mesondefine HAVE_WS2TCPIP_H
 
diff --git a/meson.build b/meson.build
index 7ff3551e..98cd436a 100644
--- a/meson.build
+++ b/meson.build
@@ -318,6 +318,10 @@ if compiler.has_header('windows.h')
     conf_data.set('HAVE_WINDOWS_H', 1)
 endif
 
+if compiler.has_header('winsock2.h')
+    conf_data.set('HAVE_WINSOCK2_H', 1)
+endif
+
 if compiler.has_header('ws2tcpip.h')
     conf_data.set('HAVE_WS2TCPIP_H', 1)
 endif
diff --git a/src/intl/gettext/localcharset.c b/src/intl/gettext/localcharset.c
index fcd80a01..ddc21619 100644
--- a/src/intl/gettext/localcharset.c
+++ b/src/intl/gettext/localcharset.c
@@ -44,6 +44,9 @@
 #endif
 #else /* WIN32 */
 #define WIN32_LEAN_AND_MEAN
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
 #include <windows.h>
 #endif
 
diff --git a/src/osdep/win32/overrides.h b/src/osdep/win32/overrides.h
index 1d0040cb..b5aed8bc 100644
--- a/src/osdep/win32/overrides.h
+++ b/src/osdep/win32/overrides.h
@@ -1,9 +1,12 @@
-
 #ifndef EL__OSDEP_WIN32_OVERRIDES_H
 #define EL__OSDEP_WIN32_OVERRIDES_H
 
 #ifdef CONFIG_OS_WIN32
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
diff --git a/src/osdep/win32/sysinfo.h b/src/osdep/win32/sysinfo.h
index e38a16c1..6356be96 100644
--- a/src/osdep/win32/sysinfo.h
+++ b/src/osdep/win32/sysinfo.h
@@ -33,14 +33,37 @@
 /* Misc defines */
 #define IN_LOOPBACKNET   127
 
+#ifndef EADDRINUSE
 #define EADDRINUSE    WSAEADDRINUSE
+#endif
+
+#ifndef EAFNOSUPPORT
 #define EAFNOSUPPORT    WSAEAFNOSUPPORT
+#endif
+
+#ifndef EALREADY
 #define EALREADY      WSAEALREADY
+#endif
+
+#ifndef ECONNREFUSED
 #define ECONNREFUSED  WSAECONNREFUSED
+#endif
+
+#ifndef ECONNRESET
 #define ECONNRESET    WSAECONNRESET
+#endif
+
+#ifndef EINPROGRESS
 #define EINPROGRESS   WSAEINPROGRESS
+#endif
+
+#ifndef EWOULDBLOCK
 #define EWOULDBLOCK   WSAEWOULDBLOCK
+#endif
+
+#ifndef ENETUNREACH
 #define ENETUNREACH   WSAENETUNREACH
+#endif
 
 #endif
 #endif
diff --git a/src/osdep/win32/vt100.h b/src/osdep/win32/vt100.h
index f82a074e..e18039b4 100644
--- a/src/osdep/win32/vt100.h
+++ b/src/osdep/win32/vt100.h
@@ -3,6 +3,10 @@
 
 #ifdef CONFIG_OS_WIN32
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
diff --git a/src/osdep/win32/win32.c b/src/osdep/win32/win32.c
index 6b6e4279..65cbb35c 100644
--- a/src/osdep/win32/win32.c
+++ b/src/osdep/win32/win32.c
@@ -7,7 +7,14 @@
 /* Get SHGFP_TYPE_CURRENT from <shlobj.h>.  */
 #define _WIN32_IE 0x500
 
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
 #include <windows.h>
+#endif
+
 #include <shlobj.h>
 
 #include "osdep/system.h"