From d5c3e75b3b4d451b33daa0f7c07c3e7a16a88d7c Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 10 Dec 2017 16:23:03 +0100
Subject: nxcomp: fix shadow warning

Fixes this:

CXX      Loop.lo
Loop.cpp: In function 'void handleCheckResultInLoop(int&, int&, int&, fd_set&, fd_set&, timeval&, timeval&)':
Loop.cpp:14080:68: warning: declaration of 'startTs' shadows a global declaration [-Wshadow]
                                             struct timeval &startTs)
                                                                    ^
Loop.cpp:1020:13: note: shadowed declaration is here
T_timestamp startTs;

Fixes ArcticaProject/nx-libs#545
---
 nxcomp/src/Loop.cpp | 4 ++--
 1 file 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 -
-- 
cgit v1.2.3


From 018c557c454ffe62696c4d113c7fe3794845dc2a Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 10 Dec 2017 18:00:15 +0100
Subject: Silence warning: "ar: 'u' modifier ignored since 'D' is the default"

Fixes ArcticaProject/nx-libs#530
---
 nx-X11/lib/configure.ac | 3 +++
 nxcomp/configure.ac     | 3 +++
 nxcompshad/configure.ac | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/nx-X11/lib/configure.ac b/nx-X11/lib/configure.ac
index 1eebf329f..a4da04592 100644
--- a/nx-X11/lib/configure.ac
+++ b/nx-X11/lib/configure.ac
@@ -44,6 +44,9 @@ X11_EXTRA_DEPS=""
 
 AC_SUBST(X11_EXTRA_DEPS)
 
+# Silence warning: ar: 'u' modifier ignored since 'D' is the default
+AC_SUBST(AR_FLAGS, [cr])
+
 # Issue an error if nx-xtrans.m4 was not found and NX_XTRANS_CONNECTION_FLAGS macro
 # was not expanded, since libNX_X11 with no transport types is rather useless.
 m4_pattern_forbid([^NX_XTRANS_CONNECTION_FLAGS$])
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/nxcompshad/configure.ac b/nxcompshad/configure.ac
index 966add584..b8e359f5d 100644
--- a/nxcompshad/configure.ac
+++ b/nxcompshad/configure.ac
@@ -25,6 +25,9 @@ AC_SUBST([COMPSHAD_VERSION])
 LT_COMPSHAD_VERSION=[`echo $COMPSHAD_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`] 
 AC_SUBST([LT_COMPSHAD_VERSION])
 
+# Silence warning: ar: 'u' modifier ignored since 'D' is the default
+AC_SUBST(AR_FLAGS, [cr])
+
 PKG_CHECK_MODULES(Xext, xext)
 PKG_CHECK_MODULES(Xdamage, xdamage)
 PKG_CHECK_MODULES(Xrandr, xrandr)
-- 
cgit v1.2.3