aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Screen.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-04-10 15:01:39 +0200
committerMihai Moldovan <ionic@ionic.de>2017-04-10 15:01:39 +0200
commit5421dd444422df233c2bba82b994ce8f8d677044 (patch)
tree9df00122916a65b8c53ee37129628efd916029f9 /nx-X11/programs/Xserver/hw/nxagent/Screen.c
parentab3974f22b213a64316bf4384c3fd6d92c005f58 (diff)
parent93ea74e53e13890ea2f85ea57e9455d0eb2525f4 (diff)
downloadnx-libs-5421dd444422df233c2bba82b994ce8f8d677044.tar.gz
nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.tar.bz2
nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.zip
Merge branch 'sunweaver-pr/remove-index-from-CloseScreen-ABI-backport' into 3.6.x
Attributes GH PR #411: https://github.com/ArcticaProject/nx-libs/pull/411
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 01d8c1fc7..8fb4ce710 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -820,7 +820,7 @@ static int nxagentColorOffset(unsigned long mask)
return count;
}
-Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
+Bool nxagentOpenScreen(ScreenPtr pScreen,
int argc, char *argv[])
{
VisualPtr visuals;
@@ -846,7 +846,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen,
#ifdef TEST
fprintf(stderr, "nxagentOpenScreen: Called for screen index [%d].\n",
- index);
+ pScreen->myNum);
#endif
if (nxagentRenderEnable && nxagentReconnectTrap == False)
@@ -2075,7 +2075,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
return True;
}
-Bool nxagentCloseScreen(int index, ScreenPtr pScreen)
+Bool nxagentCloseScreen(ScreenPtr pScreen)
{
int i;
@@ -3552,7 +3552,7 @@ Bool nxagentReconnectScreen(void *p0)
fprintf(stderr, "nxagentReconnectScreen\n");
#endif
- if (!nxagentOpenScreen(0, nxagentDefaultScreen, nxagentArgc, nxagentArgv))
+ if (!nxagentOpenScreen(nxagentDefaultScreen, nxagentArgc, nxagentArgv))
{
return False;
}