diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 01:07:02 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-27 01:07:02 +0100 |
| commit | 92d806399c69fda03275dcc23758498f9321434c (patch) | |
| tree | ccd0a621cc80b4853d6f7e262388b207db16dc4f /nx-X11/programs/Xserver/hw/nxagent/Options.c | |
| parent | 751760421f6644c22e30baa6ee8e791642d6a04d (diff) | |
| parent | 0371276fb4030261878dd6cfced9abd7bcd6137f (diff) | |
| download | nx-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/Options.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Options.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c index dba54a6c6..c06967c76 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c @@ -56,7 +56,7 @@ unsigned int nxagentPrintGeometryFlags = 0; * the options repository to the default values. */ -void nxagentInitOptions() +void nxagentInitOptions(void) { nxagentOptions.LinkType = UNDEFINED; @@ -183,7 +183,7 @@ void nxagentInitOptions() * ting. */ -void nxagentResetOptions() +void nxagentResetOptions(void) { if (nxagentLockDeferLevel == 0) { @@ -201,12 +201,12 @@ void nxagentResetOptions() nxagentOptions.KeycodeConversion = DEFAULT_KEYCODE_CONVERSION; } -void nxagentSaveOptions() +void nxagentSaveOptions(void) { memcpy(&nxagentOptionsBackup, &nxagentOptions, sizeof(AgentOptionsRec)); } -void nxagentRestoreOptions() +void nxagentRestoreOptions(void) { nxagentOptions.DeferLevel = nxagentOptionsBackup.DeferLevel; nxagentOptions.DeferTimeout = nxagentOptionsBackup.DeferTimeout; |