Merge branch 'uli42-pr/fix_shadow_warning' into 3.6.x

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$])

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

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 -

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)