aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Client.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-27 01:07:02 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-27 01:07:02 +0100
commit92d806399c69fda03275dcc23758498f9321434c (patch)
treeccd0a621cc80b4853d6f7e262388b207db16dc4f /nx-X11/programs/Xserver/hw/nxagent/Client.c
parent751760421f6644c22e30baa6ee8e791642d6a04d (diff)
parent0371276fb4030261878dd6cfced9abd7bcd6137f (diff)
downloadnx-libs-92d806399c69fda03275dcc23758498f9321434c.tar.gz
nx-libs-92d806399c69fda03275dcc23758498f9321434c.tar.bz2
nx-libs-92d806399c69fda03275dcc23758498f9321434c.zip
Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.x
Attributes GH PR #660: https://github.com/ArcticaProject/nx-libs/pull/660 Fixes: ArcticaProject/nx-libs#653 Fixes: ArcticaProject/nx-libs#639
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Client.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index 1149545eb..206b6d8e3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -253,7 +253,7 @@ void nxagentCheckIfShadowAgent(ClientPtr client)
}
}
-void nxagentWakeupByReconnect()
+void nxagentWakeupByReconnect(void)
{
int i;