Fix API version 21 and 22 compatibility for fuse_teardown

diff --git a/ChangeLog b/ChangeLog
index e41f00437360437de3548fc24707896b966c1dd3..893ebdde605953a9a9b5cf9d80183231c89ef50b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-30  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix API version 21 and 22 compatibility for fuse_teardown.
+       Reported by Bgs
+
 2006-11-29  Miklos Szeredi <miklos@szeredi.hu>
 
        * fusermount: Print a more helpful message in case the kernel

diff --git a/include/fuse.h b/include/fuse.h
index 15312968cdd4d413ac997c20dc655905609b81ca..3ac8c7ef104e0c0c863e93ca7e64fa628742642e 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -631,6 +631,7 @@ struct fuse_session *fuse_get_session(struct fuse *f);
             fuse_main_real_compat22(argc, argv, op, sizeof(*(op)))
 #    define fuse_new fuse_new_compat22
 #    define fuse_setup fuse_setup_compat22
+#    define fuse_teardown fuse_teardown_compat25
 #    define fuse_operations fuse_operations_compat22
 #    define fuse_file_info fuse_file_info_compat
 #  elif FUSE_USE_VERSION == 24
@@ -645,7 +646,7 @@ struct fuse_session *fuse_get_session(struct fuse *f);
 #      define fuse_main fuse_main_compat2
 #      define fuse_new fuse_new_compat2
 #      define __fuse_setup fuse_setup_compat2
-#      define __fuse_teardown fuse_teardown
+#      define __fuse_teardown fuse_teardown_compat25
 #      define __fuse_exited fuse_exited
 #      define __fuse_set_getcontext_func fuse_set_getcontext_func
 #    else