From: Miklos Szeredi <miklos@szeredi.hu>
Date: Thu, 11 Aug 2005 15:48:10 +0000 (+0000)
Subject: fix
X-Git-Tag: fuse_2_4_0_pre2~20
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=45c5db5475d2aa0a73675f3a5129523f82adfc18;p=qemu-gpiodev%2Flibfuse.git

fix
---

diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index 8a40c9e..432ff6f 100644
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -8,10 +8,7 @@
 
 #include <config.h>
 
-#ifdef linux
-/* For pread()/pwrite() */
-#define _XOPEN_SOURCE 500
-#endif
+#define _GNU_SOURCE
 
 #include <fuse.h>
 #include <stdio.h>
@@ -210,13 +207,13 @@ static int xmp_utime(const char *path, struct utimbuf *buf)
 
 static int xmp_open(const char *path, struct fuse_file_info *fi)
 {
-    int res;
+    int fd;
 
-    res = open(path, fi->flags);
-    if(res == -1)
+    fd = open(path, fi->flags);
+    if(fd == -1)
         return -errno;
 
-    fi->fh = res;
+    fi->fh = fd;
     return 0;
 }
 
diff --git a/include/fuse.h b/include/fuse.h
index ade49f5..ca96084 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -16,21 +16,6 @@
    new application), to use the old API define it to 21 (this is the
    default), to use the even older 1.X API define it to 11. */
 
-#ifndef FUSE_USE_VERSION
-#define FUSE_USE_VERSION 21
-#endif
-
-/** Major version of FUSE library interface */
-#define FUSE_MAJOR_VERSION 2
-
-/** Minor version of FUSE library interface */
-#define FUSE_MINOR_VERSION 4
-
-/* This interface uses 64 bit off_t */
-#if _FILE_OFFSET_BITS != 64
-#error Please add -D_FILE_OFFSET_BITS=64 to your compile flags!
-#endif
-
 #include "fuse_common.h"
 
 #include <sys/types.h>
diff --git a/include/fuse_common.h b/include/fuse_common.h
index bb120d2..648d6e4 100644
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -13,6 +13,24 @@
 #ifndef _FUSE_COMMON_H_
 #define _FUSE_COMMON_H_
 
+#ifndef FUSE_USE_VERSION
+#define FUSE_USE_VERSION 21
+#endif
+
+/** Major version of FUSE library interface */
+#define FUSE_MAJOR_VERSION 2
+
+/** Minor version of FUSE library interface */
+#define FUSE_MINOR_VERSION 4
+
+#define FUSE_MAKE_VERSION(maj, min)  ((maj) * 10 + (min))
+#define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)
+
+/* This interface uses 64 bit off_t */
+#if _FILE_OFFSET_BITS != 64
+#error Please add -D_FILE_OFFSET_BITS=64 to your compile flags!
+#endif
+
 /** Information about open files */
 struct fuse_file_info {
     /** Open flags.  Available in open() and release() */
diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index cf990fb..08c6deb 100644
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -337,7 +337,7 @@ struct fuse_conn {
 	/** Are file locking primitives not implemented by fs? */
 	unsigned no_lk : 1;
 
-	/** Is access not implemented by fs */
+	/** Is access not implemented by fs? */
 	unsigned no_access : 1;
 
 #ifdef KERNEL_2_6