diff options
author | KWSys Upstream <kwrobot@kitware.com> | 2016-02-22 13:56:45 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-02-22 14:02:03 (GMT) |
commit | a132064b4821ee21c45717b459351ac4ffe4d372 (patch) | |
tree | f159c92ec60003354551ef369ed68962862cc0a2 /ProcessUNIX.c | |
parent | ffcc235c7ee2528638fd2ae4029eabcd5b0f1042 (diff) | |
download | CMake-a132064b4821ee21c45717b459351ac4ffe4d372.zip CMake-a132064b4821ee21c45717b459351ac4ffe4d372.tar.gz CMake-a132064b4821ee21c45717b459351ac4ffe4d372.tar.bz2 |
KWSys 2016-02-22 (4847aedd)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 4847aedde22b0026accbb71e5480ed353a330e02 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
de83c4d4 SystemTools: support deleting junction points
Chuck Atkins (1):
3e1b7395 SystemInformation: Ignore buffers and cache when reporting host memory use
Costy Petrisor (1):
9fe15333 Update hidden includes to support CMake header dependency scanning
Zack Galbreath (1):
4847aedd Process: Allow timeout to be changed after child starts
Diffstat (limited to 'ProcessUNIX.c')
-rw-r--r-- | ProcessUNIX.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ProcessUNIX.c b/ProcessUNIX.c index 07c644b..7402955 100644 --- a/ProcessUNIX.c +++ b/ProcessUNIX.c @@ -505,6 +505,8 @@ void kwsysProcess_SetTimeout(kwsysProcess* cp, double timeout) { cp->Timeout = 0; } + // Force recomputation of TimeoutTime. + cp->TimeoutTime.tv_sec = -1; } /*--------------------------------------------------------------------------*/ |