From 8472d81ea00dc16a55b55a21ed34499390604941 Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimkov Date: Thu, 6 Feb 2020 16:25:06 +0600 Subject: [PATCH] [Ada] Fix socket timeout correction for Windows Server 2019 case 2020-06-08 Dmitriy Anisimkov gcc/ada/ * socket.c (__gnat_minus_500ms): Remove IsWindowsVersionOrGreater from condition. --- gcc/ada/socket.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/ada/socket.c b/gcc/ada/socket.c index 83e9480cbde..4e367901837 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 -- 2.30.2