diff options
author | Brad King <brad.king@kitware.com> | 2016-02-22 09:03:40 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-02-22 09:03:40 -0500 |
commit | d010ba9fa71035f44e6df2fdf86bf38ab8559df5 (patch) | |
tree | 5febe614b72558ce1a618d15fc67f141203049f4 /Source/kwsys/ProcessWin32.c | |
parent | df246f7c7f655f9ea6df0c64e131d2eb0cafd789 (diff) | |
parent | a132064b4821ee21c45717b459351ac4ffe4d372 (diff) | |
download | cmake-d010ba9fa71035f44e6df2fdf86bf38ab8559df5.tar.gz |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-02-22 (4847aedd)
Diffstat (limited to 'Source/kwsys/ProcessWin32.c')
-rw-r--r-- | Source/kwsys/ProcessWin32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/kwsys/ProcessWin32.c b/Source/kwsys/ProcessWin32.c index 1f8749fbea..a18ea2748f 100644 --- a/Source/kwsys/ProcessWin32.c +++ b/Source/kwsys/ProcessWin32.c @@ -17,7 +17,7 @@ duplicate the above list of headers. */ #if 0 # include "Process.h.in" -# include "Encoding_c.h.in" +# include "Encoding.h.in" #endif /* @@ -698,6 +698,8 @@ void kwsysProcess_SetTimeout(kwsysProcess* cp, double timeout) { cp->Timeout = 0; } + // Force recomputation of TimeoutTime. + cp->TimeoutTime.QuadPart = -1; } /*--------------------------------------------------------------------------*/ |