diff options
| author | Brad King <brad.king@kitware.com> | 2015-12-01 13:46:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-12-01 13:46:55 (GMT) |
| commit | fe05ad975292a2ff57a66746f1aa3870217f1ddd (patch) | |
| tree | 6746522ac4c8c03e21384882a8232a3d9114e861 /Source/kwsys/ProcessUNIX.c | |
| parent | 2218962dbdc7f552a076978a0393433091aa35c4 (diff) | |
| parent | e25f294a0e0aa03da4516d0baa488ad02cece089 (diff) | |
| download | CMake-fe05ad975292a2ff57a66746f1aa3870217f1ddd.zip CMake-fe05ad975292a2ff57a66746f1aa3870217f1ddd.tar.gz CMake-fe05ad975292a2ff57a66746f1aa3870217f1ddd.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/ProcessUNIX.c')
| -rw-r--r-- | Source/kwsys/ProcessUNIX.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c index 6d9b109..b0ddf5a 100644 --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c @@ -2241,7 +2241,7 @@ static kwsysProcessTime kwsysProcessTimeAdd(kwsysProcessTime in1, kwsysProcessTi kwsysProcessTime out; out.tv_sec = in1.tv_sec + in2.tv_sec; out.tv_usec = in1.tv_usec + in2.tv_usec; - if(out.tv_usec > 1000000) + if(out.tv_usec >= 1000000) { out.tv_usec -= 1000000; out.tv_sec += 1; |