From e4b19abd1d6c3cd105cc334fa4b57f7cb0d1fc82 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Fri, 3 May 2013 02:25:13 -0700
Subject: chanarv: x prefix for stream functions to avoid name collision

---
 sesman/chansrv/chansrv_fuse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sesman/chansrv/chansrv_fuse.c')

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))
     {
-- 
cgit v1.2.1