aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-09 21:01:34 +0100
committerUlrich Sibiller <uli42@gmx.de>2020-01-09 21:02:02 +0100
commitc137c2a4d68cb17802275739a40cf0ad7eda9bc8 (patch)
tree7bcd3c21273d15ae86de59f63f621e7df2a5e10a /nx-X11/programs
parent4953c651de3ae0298c87e4c09107bee7adebe8e4 (diff)
downloadnx-libs-c137c2a4d68cb17802275739a40cf0ad7eda9bc8.tar.gz
nx-libs-c137c2a4d68cb17802275739a40cf0ad7eda9bc8.tar.bz2
nx-libs-c137c2a4d68cb17802275739a40cf0ad7eda9bc8.zip
Clipboard.c: fix shadowed variable
this was harmless but not nice nevertheless. Clipboard.c: In function ‘nxagentConvertSelection’: Clipboard.c:1850:9: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local] int i = nxagentFindCurrentSelectionIndex(selection); ^ Clipboard.c:1736:7: note: shadowed declaration is here int i = nxagentFindCurrentSelectionIndex(selection); ^
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 47eaa946d..1d5054fbb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1733,13 +1733,15 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
return 0;
}
- int i = nxagentFindCurrentSelectionIndex(selection);
- if (i < NumCurrentSelections && IS_INTERNAL_OWNER(i))
{
- /*
- * There is a client owner on the agent side, let normal dix stuff happen.
- */
- return 0;
+ int i = nxagentFindCurrentSelectionIndex(selection);
+ if (i < NumCurrentSelections && IS_INTERNAL_OWNER(i))
+ {
+ /*
+ * There is a client owner on the agent side, let normal dix stuff happen.
+ */
+ return 0;
+ }
}
/*