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

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
oops, should do FUSE_USE_VERSION magic before including <fuse.h>


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- ntfsmount.c	29 Nov 2005 17:57:53 -0000	1.66
+++ ntfsmount.c	29 Nov 2005 18:00:06 -0000	1.67
@@ -24,6 +24,11 @@
 
 #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>
@@ -72,8 +77,6 @@
 #endif
 
 #ifdef __FreeBSD__
-#undef  FUSE_USE_VERSION
-#define FUSE_USE_VERSION 25
 typedef struct statvfs nf_statfs;
 #else
 typedef struct statfs nf_statfs;
@@ -226,7 +229,7 @@ static int ntfs_fuse_statfs(const char *
 #ifndef __FreeBSD__
 	/* Type of filesystem. */
 	sfs->f_type = NTFS_SB_MAGIC;
-#endif
+#endif /* __FreeBSD__ */
 	/* Optimal transfer block size. */
 	sfs->f_bsize = vol->cluster_size;
 	/*
@@ -253,7 +256,7 @@ static int ntfs_fuse_statfs(const char *
 	sfs->f_namelen = NTFS_MAX_NAME_LEN;
 #else
 	sfs->f_namemax = NTFS_MAX_NAME_LEN;
-#endif
+#endif /* __FreeBSD__ */
 	return 0;
 }