From 3a77047661e345939e36f761db7a7a04ae632b76 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 11 Nov 2005 21:32:42 +0000
Subject: fix

---
 include/fuse.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'include/fuse.h')

diff --git a/include/fuse.h b/include/fuse.h
index 2e977b2..adf0c9a 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -167,7 +167,14 @@ struct fuse_operations {
                   struct fuse_file_info *);
 
     /** Just a placeholder, don't set */
-    void (*statfs_old) (void);
+    /** Get file system statistics
+     *
+     * The 'f_frsize', 'f_favail', 'f_fsid' and 'f_flag' fields are ignored
+     *
+     * Replaced 'struct statfs' parameter with 'struct statvfs' in
+     * version 2.5
+     */
+    int (*statfs) (const char *, struct statvfs *);
 
     /** Possibly flush cached data
      *
@@ -353,15 +360,6 @@ struct fuse_operations {
      * Introduced in version 2.5
      */
     int (*fgetattr) (const char *, struct stat *, struct fuse_file_info *);
-
-    /** Get file system statistics
-     *
-     * The 'f_frsize', 'f_favail', 'f_fsid' and 'f_flag' fields are ignored
-     *
-     * Replaced 'struct statfs' parameter with 'struct statvfs' in
-     * version 2.5
-     */
-    int (*statfs) (const char *, struct statvfs *);
 };
 
 /** Extra context that may be needed by some filesystems
@@ -549,8 +547,12 @@ void fuse_set_getcontext_func(struct fuse_context *(*func)(void));
 #  undef fuse_main
 #  if FUSE_USE_VERSION == 22
 #    define FUSE_MINOR_VERSION 4
-#    define fuse_main fuse_main_compat22
+#    define fuse_main(argc, argv, op) \
+            fuse_main_real_compat22(argc, argv, op, sizeof(*(op)))
+#    define fuse_new fuse_new_compat22
+#    define fuse_setup fuse_setup_compat22
 #    define fuse_operations fuse_operations_compat22
+#    define fuse_file_info fuse_file_info_compat22
 #  else
 #    define fuse_dirfil_t fuse_dirfil_t_compat
 #    define __fuse_read_cmd fuse_read_cmd
-- 
cgit v1.2.3