Imported Upstream version 6.12.0.86

Former-commit-id: 7a84ce7d08c42c458ac8e74b27186ca863315d79
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-07-10 08:44:59 +00:00
parent 92747312ea
commit 0b380204a4
812 changed files with 26901 additions and 9053 deletions

View File

@@ -481,13 +481,6 @@ wait_for_any (signal_info** signals, int count, int *currfd, struct pollfd* fd_s
// Poll until one of this signal_info's pipes is ready to read.
// Once a second, stop to check if the VM is shutting down.
do {
struct timeval tv;
struct timeval *ptv = NULL;
if (timeout != -1) {
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000)*1000;
ptv = &tv;
}
r = poll (fd_structs, count, timeout);
} while (keep_trying (r) && !shutting_down ());