From: Dmitriy Anisimkov <anisimko@adacore.com>
Date: Thu, 6 Feb 2020 10:25:06 +0000 (+0600)
Subject: [Ada] Fix socket timeout correction for Windows Server 2019 case
X-Git-Tag: upstream/12.2.0~15922
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8472d81ea00dc16a55b55a21ed34499390604941;p=platform%2Fupstream%2Fgcc.git

[Ada] Fix socket timeout correction for Windows Server 2019 case

2020-06-08  Dmitriy Anisimkov  <anisimko@adacore.com>

gcc/ada/

	* socket.c (__gnat_minus_500ms): Remove
	IsWindowsVersionOrGreater from condition.
---

diff --git a/gcc/ada/socket.c b/gcc/ada/socket.c
index 83e9480..4e36790 100644
--- a/gcc/ada/socket.c
+++ b/gcc/ada/socket.c
@@ -801,10 +801,12 @@ const char * __gnat_gai_strerror(int errcode) {
 
 int __gnat_minus_500ms() {
 #if defined (_WIN32)
-  // Windows Server 2019 and Windows 8.0 do not need 500 millisecond socket
-  // timeout correction.
-  return !(IsWindows8OrGreater() && !IsWindowsServer()
-           || IsWindowsVersionOrGreater(10, 0, 17763));
+  // Windows 8.0 and newer do not need 500 millisecond socket timeout
+  // correction.
+  // We do not know the Windows server version without socket timeout
+  // correction for now. When we know, we can add the call for
+  // IsWindowsVersionOrGreater(10, 0, ????) into condition.
+  return !IsWindows8OrGreater() || IsWindowsServer();
 #else
    return 0;
 #endif