From 4a4dab14c52704fd7865ba1d45d3c4969339b235 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Tue, 31 May 2016 09:46:02 -0700
Subject: [PATCH] inc: fuse: remove long references (as they have different
 size in Win64 and Cygwin64)

---
 inc/fuse/fuse_common.h | 14 +++++++-------
 inc/fuse/fuse_opt.h    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/fuse/fuse_common.h b/inc/fuse/fuse_common.h
index 68f4d6a5..4aad6a19 100644
--- a/inc/fuse/fuse_common.h
+++ b/inc/fuse/fuse_common.h
@@ -95,7 +95,7 @@ typedef int32_t fuse_blkcnt_t;
 struct fuse_timespec
 {
     time_t tv_sec;
-    long tv_nsec;
+    int tv_nsec;
 };
 
 struct fuse_stat
@@ -118,17 +118,17 @@ struct fuse_stat
 
 struct fuse_statvfs
 {
-    unsigned long f_bsize;
-    unsigned long f_frsize;
+    unsigned int f_bsize;
+    unsigned int f_frsize;
     fuse_fsblkcnt_t f_blocks;
     fuse_fsblkcnt_t f_bfree;
     fuse_fsblkcnt_t f_bavail;
     fuse_fsfilcnt_t f_files;
     fuse_fsfilcnt_t f_ffree;
     fuse_fsfilcnt_t f_favail;
-    unsigned long f_fsid;
-    unsigned long f_flag;
-    unsigned long f_namemax;
+    unsigned int f_fsid;
+    unsigned int f_flag;
+    unsigned int f_namemax;
 };
 
 #define FSP_FUSE_ENVIRONMENT            'W'
@@ -170,7 +170,7 @@ struct fuse_statvfs
 struct fuse_file_info
 {
     int flags;
-    unsigned long fh_old;
+    unsigned int fh_old;
     int writepage;
     unsigned int direct_io:1;
     unsigned int keep_cache:1;
diff --git a/inc/fuse/fuse_opt.h b/inc/fuse/fuse_opt.h
index 57343531..1882243f 100644
--- a/inc/fuse/fuse_opt.h
+++ b/inc/fuse/fuse_opt.h
@@ -62,7 +62,7 @@ extern "C" {
 struct fuse_opt
 {
 	const char *templ;
-	unsigned long offset;
+	unsigned int offset;
 	int value;
 };