aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
Diffstat (limited to 'nxcomp')
-rw-r--r--nxcomp/configure.ac3
-rw-r--r--nxcomp/src/Loop.cpp4
2 files changed, 5 insertions, 2 deletions
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 3ae81f0d1..8037250e7 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -25,6 +25,9 @@ AC_SUBST([COMP_VERSION])
LT_COMP_VERSION=[`echo $COMP_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`]
AC_SUBST([LT_COMP_VERSION])
+# Silence warning: ar: 'u' modifier ignored since 'D' is the default
+AC_SUBST(AR_FLAGS, [cr])
+
# Upstream's pkg.m4 (since 0.27) offers this now, but define our own
# compatible version in case the local version of pkgconfig isn't new enough.
# https://bugs.freedesktop.org/show_bug.cgi?id=48743
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 -