Fix compile errors when NTDDI_VERSION not defined in mingw

Author: halx99

yasio/compiler/feature_test.hpp

@@ -119,10 +119,16 @@ SOFTWARE.
 #  define YASIO__OS_BSD_LIKE 0
 #endif
 
+#if !defined(_WIN32) || (defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_VISTA) || (defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600)
+#  define YASIO__OS_NT6 1
+#else
+#  define YASIO__OS_NT6 0
+#endif
+
 /// Tests multiplex io model of current OS
 
 // poll
-#if !defined(_WIN32) || NTDDI_VERSION >= NTDDI_VISTA
+#if YASIO__OS_NT6
 #  define YASIO__HAS_POLL 1
 #else
 #  define YASIO__HAS_POLL 0
@@ -177,12 +183,18 @@ SOFTWARE.
 #  define YASIO__HAS_SA_LEN 0
 #endif
 
-#if !defined(_WIN32) || NTDDI_VERSION >= NTDDI_VISTA
+#if YASIO__OS_NT6
 #  define YASIO__HAS_NTOP 1
 #else
 #  define YASIO__HAS_NTOP 0
 #endif
 
+#if defined(NTDDI_WIN10_RS2) && NTDDI_VERSION >= NTDDI_WIN10_RS2
+#  define YASIO__OS_NT10_RS2 1
+#else
+#  define YASIO__OS_NT10_RS2 0
+#endif
+
 #if defined(_WIN32) && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)) && !defined(__MINGW64__) && !defined(__MINGW32__)
 #  define YASIO__HAS_WIN32_TIMEAPI 1
 #else

yasio/xxsocket.cpp

@@ -944,7 +944,7 @@ unsigned int xxsocket::tcp_rtt() const { return xxsocket::tcp_rtt(this->fd); }
 unsigned int xxsocket::tcp_rtt(socket_native_type s)
 {
 #if defined(_WIN32)
-#  if defined(NTDDI_WIN10_RS2) && NTDDI_VERSION >= NTDDI_WIN10_RS2
+#  if YASIO__OS_NT10_RS2
   TCP_INFO_v0 info;
   DWORD tcpi_ver = 0, bytes_transferred = 0;
   int status = WSAIoctl(s, SIO_TCP_INFO,
@@ -1035,6 +1035,21 @@ const char* xxsocket::strerror_r(int error, char* buf, size_t buflen)
   return buf;
 }
 
+void xxsocket::update_connect_context(socket_native_type s, std::error_code& ec)
+{
+#if defined(_WIN32)
+  if (!ec)
+  {
+    // Need to set the SO_UPDATE_CONNECT_CONTEXT option so that getsockname
+    // and getpeername will work on the connected socket.
+    // socket_ops::state_type state        = 0;
+    const int so_update_connect_context = 0x7010;
+    if (xxsocket::set_optval(s, SOL_SOCKET, so_update_connect_context, nullptr, 0) < 0)
+      ec = std::error_code(::WSAGetLastError(), std::system_category());
+  }
+#endif
+}
+
 const char* xxsocket::gai_strerror(int error)
 {
 #if defined(_WIN32)

yasio/xxsocket.hpp

@@ -1066,6 +1066,8 @@ class YASIO_API xxsocket {
   YASIO__DECL static const char* strerror_r(int error, char* buf, size_t buflen);
   YASIO__DECL static const char* gai_strerror(int error);
 
+  YASIO__DECL static void update_connect_context(socket_native_type s, std::error_code& ec);
+
   /// <summary>
   /// Resolve both ipv4 and ipv6 address as-is
   /// </summary>