[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.67,1.68

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv401/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
Easier FreeBSD support, allow FUSE >= 2.3 for FreeBSD


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- ntfsmount.c	29 Nov 2005 18:00:06 -0000	1.67
+++ ntfsmount.c	30 Nov 2005 16:54:11 -0000	1.68
@@ -24,11 +24,6 @@
 
 #include "config.h"
 
-#ifdef __FreeBSD__
-#undef  FUSE_USE_VERSION
-#define FUSE_USE_VERSION 25
-#endif /* __FreeBSD__ */
-
 #include <fuse.h>
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -76,12 +71,6 @@
 #define PATH_MAX 4096
 #endif
 
-#ifdef __FreeBSD__
-typedef struct statvfs nf_statfs;
-#else
-typedef struct statfs nf_statfs;
-#endif /* __FreeBSD__ */
-
 typedef struct {
 	fuse_fill_dir_t filler;
 	void *buf;
@@ -218,7 +207,7 @@ static __inline__ void ntfs_fuse_mark_fr
  * Return 0 on success or -errno on error.
  */
 static int ntfs_fuse_statfs(const char *path __attribute__((unused)),
-		nf_statfs *sfs)
+		struct statfs *sfs)
 {
 	long size;
 	ntfs_volume *vol;
@@ -226,10 +215,8 @@ static int ntfs_fuse_statfs(const char *
 	vol = ctx->vol;
 	if (!vol)
 		return -ENODEV;
-#ifndef __FreeBSD__
 	/* Type of filesystem. */
 	sfs->f_type = NTFS_SB_MAGIC;
-#endif /* __FreeBSD__ */
 	/* Optimal transfer block size. */
 	sfs->f_bsize = vol->cluster_size;
 	/*