summaryrefslogtreecommitdiffstats
path: root/sesman
diff options
context:
space:
mode:
authornorrarvid <norrarvid@gmail.com>2012-05-29 13:24:23 +0200
committernorrarvid <norrarvid@gmail.com>2012-05-29 13:24:23 +0200
commit2109d7a044430ee4ad5b51f2c18cc496be0e7fd8 (patch)
tree17d9b9852a05fe9f9a67540670bef1b3c3d14b69 /sesman
parent60b052965634be151d88f7011149d0edc71f23d8 (diff)
parenta45f993bfe74aed27245454f1ae32302b0528d9f (diff)
downloadxrdp-proprietary-2109d7a044430ee4ad5b51f2c18cc496be0e7fd8.tar.gz
xrdp-proprietary-2109d7a044430ee4ad5b51f2c18cc496be0e7fd8.zip
merge comments defines and simplified function
Diffstat (limited to 'sesman')
-rw-r--r--sesman/chansrv/chansrv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
index f2ca961d..e9d596cf 100644
--- a/sesman/chansrv/chansrv.c
+++ b/sesman/chansrv/chansrv.c
@@ -447,7 +447,7 @@ channel_thread_loop(void* in_val)
num_objs = 0;
objs[num_objs] = g_term_event;
num_objs++;
- trans_get_wait_objs(g_lis_trans, objs, &num_objs, &timeout);
+ trans_get_wait_objs(g_lis_trans, objs, &num_objs);
while (g_obj_wait(objs, num_objs, 0, 0, timeout) == 0)
{
if (g_is_wait_obj_set(g_term_event))
@@ -492,8 +492,8 @@ channel_thread_loop(void* in_val)
num_objs = 0;
objs[num_objs] = g_term_event;
num_objs++;
- trans_get_wait_objs(g_lis_trans, objs, &num_objs, &timeout);
- trans_get_wait_objs(g_con_trans, objs, &num_objs, &timeout);
+ trans_get_wait_objs(g_lis_trans, objs, &num_objs);
+ trans_get_wait_objs(g_con_trans, objs, &num_objs);
clipboard_get_wait_objs(objs, &num_objs, &timeout);
sound_get_wait_objs(objs, &num_objs, &timeout);
dev_redir_get_wait_objs(objs, &num_objs, &timeout);