From b7d5159ec9fcc229e47392dc0dfec191d361b398 Mon Sep 17 00:00:00 2001 From: Dmitriy Anisimkov Date: Thu, 4 Jul 2019 08:05:13 +0000 Subject: [Ada] GNAT.Sockets: fix socket timeout on recent Windows versions 2019-07-04 Dmitriy Anisimkov gcc/ada/ * doc/gnat_ugn/platform_specific_information.rst: Document Windows socket timeout particularity. * gnat_ugn.texi: Regenerate. * gsocket.h: Include versionhelpers.h. * socket.c (__gnat_minus_500ms): New function. * libgnat/g-sothco.ads (Minus_500ms_Windows_Timeout): New imported function. * libgnat/g-socket.adb (Set_Socket_Option): Refactor to remove 500ms from the requested timeout only on old Windows version. From-SVN: r273045 --- gcc/ada/socket.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gcc/ada/socket.c') diff --git a/gcc/ada/socket.c b/gcc/ada/socket.c index a265e01..8fc8415 100644 --- a/gcc/ada/socket.c +++ b/gcc/ada/socket.c @@ -803,4 +803,15 @@ const char * __gnat_gai_strerror(int errcode) { #endif +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)); +#else + return 0; +#endif +} + #endif /* defined(HAVE_SOCKETS) */ -- cgit v1.1