From 789096a71d65b1bead14286bf508095abb01151a Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Tue, 3 Apr 2018 19:40:11 +0200
Subject: [PATCH 1/2] Only redefine _WIN32_WINNT macro when < 0x0501

---
 library/net.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/net.c b/library/net.c
index e3aa2a993..e8123cc81 100644
--- a/library/net.c
+++ b/library/net.c
@@ -34,11 +34,12 @@
 #if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \
     !defined(EFI32)
 
-#ifdef _WIN32_WINNT
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)
 #undef _WIN32_WINNT
-#endif
 /* Enables getaddrinfo() & Co */
 #define _WIN32_WINNT 0x0501
+#endif
+
 #include <ws2tcpip.h>
 
 #include <winsock2.h>

From 0c362f68b34e498cef5e4417d3e482f8ba18ab19 Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Fri, 8 Jun 2018 16:27:04 +0100
Subject: [PATCH 2/2] Add ChangeLog entry for _WIN32_WINNT override fix

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3f49a2170..1db0dc7e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ Bugfix
      calling mbedtls_x509_crt_parse_path().
    * Fix redundant declaration of mbedtls_ssl_list_ciphersuites. Raised by
      TrinityTonic. #1359.
+   * Fix for redefinition of _WIN32_WINNT to avoid overriding a definition
+     used by user applications. Found and fixed by Fabio Alessandrelli.
 
 = mbed TLS 2.1.12 branch released 2018-04-30