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/Window.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/Window.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 977b955a6..e2ce9d372 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -548,7 +548,7 @@ void nxagentSetVersionProperty(WindowPtr pWin) #endif } -Bool nxagentSomeWindowsAreMapped() +Bool nxagentSomeWindowsAreMapped(void) { WindowPtr pWin = screenInfo.screens[0]->root -> firstChild; @@ -2524,7 +2524,7 @@ void nxagentUnmapWindows(void) NXFlushDisplay(nxagentDisplay, NXFlushLink); } -void nxagentMapDefaultWindows() +void nxagentMapDefaultWindows(void) { int i; @@ -3930,7 +3930,7 @@ int nxagentRemoveItemBSPixmapList(unsigned long pixmapId) return 0; } -int nxagentEmptyBSPixmapList() +int nxagentEmptyBSPixmapList(void) { int i; |