diff options
| author | Dmitriy Anisimkov <anisimko@adacore.com> | 2020-02-06 16:25:06 +0600 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-06-08 03:50:52 -0400 |
| commit | 8472d81ea00dc16a55b55a21ed34499390604941 (patch) | |
| tree | 76a80d8e0cfc6a294040651c97bdfd9f182f55fe /gcc/ada/socket.c | |
| parent | 54c1fdb62b647c1dedf6d58d260ed85e93e0af20 (diff) | |
| download | gcc-8472d81ea00dc16a55b55a21ed34499390604941.zip gcc-8472d81ea00dc16a55b55a21ed34499390604941.tar.gz gcc-8472d81ea00dc16a55b55a21ed34499390604941.tar.bz2 | |
[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.
Diffstat (limited to 'gcc/ada/socket.c')
| -rw-r--r-- | gcc/ada/socket.c | 10 |
1 files changed, 6 insertions, 4 deletions
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 |