diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-11 09:49:05 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-11 09:49:05 +0100 |
| commit | 7882a39ad235c7d09f9ec9994c6ced62897ac1c0 (patch) | |
| tree | 1224892d727e69ac05c8f1ab49597e30a3f6855d /nxcomp/src | |
| parent | 29bb123124ae92c10baf49204da36184e05ae232 (diff) | |
| parent | 018c557c454ffe62696c4d113c7fe3794845dc2a (diff) | |
| download | nx-libs-7882a39ad235c7d09f9ec9994c6ced62897ac1c0.tar.gz nx-libs-7882a39ad235c7d09f9ec9994c6ced62897ac1c0.tar.bz2 nx-libs-7882a39ad235c7d09f9ec9994c6ced62897ac1c0.zip | |
Merge branch 'uli42-pr/fix_shadow_warning' into 3.6.x
Attributes GH PR #594: https://github.com/ArcticaProject/nx-libs/pull/594
Diffstat (limited to 'nxcomp/src')
| -rw-r--r-- | nxcomp/src/Loop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index baad17699..bb6d18531 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -14079,9 +14079,9 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet, static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet, fd_set &writeSet, struct timeval &selectTs, - struct timeval &startTs) + struct timeval &pstartTs) { - int diffTs = diffTimestamp(startTs, getNewTimestamp()); + int diffTs = diffTimestamp(pstartTs, getNewTimestamp()); if (diffTs >= (control -> PingTimeout - |