summaryrefslogtreecommitdiffstats
path: root/sesman/chansrv/chansrv_fuse.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2013-05-03 02:25:13 -0700
committerJay Sorg <jay.sorg@gmail.com>2013-05-03 02:25:13 -0700
commite4b19abd1d6c3cd105cc334fa4b57f7cb0d1fc82 (patch)
tree21c0bb4e188bdeb0b8ac08ed3187674cf5be1712 /sesman/chansrv/chansrv_fuse.c
parent64fabbad687aed9a51357a39e284643d77675a04 (diff)
downloadxrdp-proprietary-e4b19abd1d6c3cd105cc334fa4b57f7cb0d1fc82.tar.gz
xrdp-proprietary-e4b19abd1d6c3cd105cc334fa4b57f7cb0d1fc82.zip
chanarv: x prefix for stream functions to avoid name collision
Diffstat (limited to 'sesman/chansrv/chansrv_fuse.c')
-rw-r--r--sesman/chansrv/chansrv_fuse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c
index 1e77eebc..6b4bb6dd 100644
--- a/sesman/chansrv/chansrv_fuse.c
+++ b/sesman/chansrv/chansrv_fuse.c
@@ -1942,7 +1942,7 @@ void xfuse_devredir_cb_file_close(void *vp)
xinode->nopen--;
if ((xinode->nopen == 0) && fip->fi && fip->fi->fh)
- free((char *) fip->fi->fh);
+ free((char *) (tintptr) (fip->fi->fh));
fuse_reply_err(fip->req, 0);
}
@@ -2645,7 +2645,7 @@ static void xfuse_cb_flush(fuse_req_t req, fuse_ino_t ino, struct
fuse_file_info *fi)
{
XFUSE_INFO *fip = NULL;
- XFUSE_HANDLE *handle = (XFUSE_HANDLE *) fi->fh;
+ XFUSE_HANDLE *handle = (XFUSE_HANDLE *) (tintptr) (fi->fh);
if (!xfuse_is_inode_valid(ino))
{