From e12ba8eaeeec7cf6f907f81961f932d0abd240d7 Mon Sep 17 00:00:00 2001
From: Edward Lee <e45lee@uwaterloo.ca>
Date: Thu, 21 Jan 2021 17:47:33 -0500
Subject: [PATCH] Win32: Fix build issues.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/359>
---
 src/pulsecore/arpa-inet.c | 2 +-
 src/pulsecore/arpa-inet.h | 2 +-
 src/pulsecore/poll.h      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pulsecore/arpa-inet.c b/src/pulsecore/arpa-inet.c
index 309009876..f917286ea 100644
--- a/src/pulsecore/arpa-inet.c
+++ b/src/pulsecore/arpa-inet.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32) && NTDDI_VERSION < NTDDI_VISTA
+#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32) && (_WIN32_WINNT <= 0x0600)
 
 #include <errno.h>
 
diff --git a/src/pulsecore/arpa-inet.h b/src/pulsecore/arpa-inet.h
index 775c2269d..a3bc840e6 100644
--- a/src/pulsecore/arpa-inet.h
+++ b/src/pulsecore/arpa-inet.h
@@ -12,7 +12,7 @@
 
 #include <pulsecore/socket.h>
 
-#if NTDDI_VERSION < NTDDI_VISTA
+#if (_WIN32_WINNT <= 0x0600)
 
 const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
 
diff --git a/src/pulsecore/poll.h b/src/pulsecore/poll.h
index af34506c5..df8cc4e1b 100644
--- a/src/pulsecore/poll.h
+++ b/src/pulsecore/poll.h
@@ -24,7 +24,7 @@
 
 #if defined(HAVE_POLL_H)
 #include <poll.h>
-#elif OS_IS_WIN32 && HAVE_WINSOCK2_H && NTDDI_VERSION >= NTDDI_VISTA
+#elif OS_IS_WIN32 && HAVE_WINSOCK2_H && (_WIN32_WINNT >= 0x0600)
 #include <winsock2.h>
 #else