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/Atoms.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/Atoms.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 9bcdee628..e2d97d2b4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -114,7 +114,7 @@ static void catchAndRedirect(Display* dpy, XErrorEvent* X) } } -static void startWMDetection() +static void startWMDetection(void) { /* * We are trying to detect if is there any client @@ -420,7 +420,7 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d * the Xserver values and the atom names. */ -void nxagentResetAtomMap() +void nxagentResetAtomMap(void) { unsigned i; |