summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2015-07-13 01:10:48 -0700
committerJay Sorg <jay.sorg@gmail.com>2015-07-13 01:10:48 -0700
commit6c23b85593600e96fba8c67e5fd21586bfafcb15 (patch)
tree117953cf72098c22b926a08f174a5e0333515d59 /common
parent136e0725130ae74e7578d50f9ed16d44c0a5067a (diff)
downloadxrdp-proprietary-6c23b85593600e96fba8c67e5fd21586bfafcb15.tar.gz
xrdp-proprietary-6c23b85593600e96fba8c67e5fd21586bfafcb15.zip
add timeout to trans_get_wait_objs_rw
Diffstat (limited to 'common')
-rw-r--r--common/trans.c2
-rw-r--r--common/trans.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/trans.c b/common/trans.c
index 4253e6f0..31da1325 100644
--- a/common/trans.c
+++ b/common/trans.c
@@ -171,7 +171,7 @@ trans_get_wait_objs(struct trans *self, tbus *objs, int *count)
/*****************************************************************************/
int APP_CC
trans_get_wait_objs_rw(struct trans *self, tbus *robjs, int *rcount,
- tbus *wobjs, int *wcount)
+ tbus *wobjs, int *wcount, int *timeout)
{
if (self == 0)
{
diff --git a/common/trans.h b/common/trans.h
index 34816eed..639e64d1 100644
--- a/common/trans.h
+++ b/common/trans.h
@@ -95,7 +95,7 @@ trans_get_wait_objs(struct trans* self, tbus* objs, int* count);
int APP_CC
trans_get_wait_objs_rw(struct trans *self,
tbus *robjs, int *rcount,
- tbus *wobjs, int *wcount);
+ tbus *wobjs, int *wcount, int *timeout);
int APP_CC
trans_check_wait_objs(struct trans* self);
int APP_CC