From 065f222cd58501acbe6dde5520c1c2498e8d3c08 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 20 Jan 2006 15:15:21 +0000
Subject: fix

---
 include/fuse_lowlevel.h | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'include/fuse_lowlevel.h')

diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index e45968c..0c4672f 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -141,7 +141,7 @@ struct fuse_lowlevel_ops {
      *
      * @param userdata the user data passed to fuse_lowlevel_new()
      */
-    void (*init) (void *userdata);
+    void (*init) (void *userdata, struct fuse_conn_info *conn);
 
     /**
      * Clean up filesystem
@@ -1235,27 +1235,29 @@ void fuse_remove_signal_handlers(struct fuse_session *se);
  * Compatibility stuff                                         *
  * ----------------------------------------------------------- */
 
-#ifndef __FreeBSD__
+#ifdef __FreeBSD__
+#  if FUSE_USE_VERSION < 25
+#    error On FreeBSD API version 25 or greater must be used
+#  endif
+#endif
 
-#if FUSE_USE_VERSION == 24
+#if FUSE_USE_VERSION == 25 || FUSE_USE_VERSION == 24
 #  include "fuse_lowlevel_compat.h"
 #  undef FUSE_MINOR_VERSION
-#  define FUSE_MINOR_VERSION 4
-#  define fuse_file_info fuse_file_info_compat
-#  define fuse_reply_statfs fuse_reply_statfs_compat
-#  define fuse_reply_open fuse_reply_open_compat
-#elif FUSE_USE_VERSION < 25
-#  error Compatibility with low level API version other than 24 not supported
+#  if FUSE_USE_VERSION == 25
+#    define FUSE_MINOR_VERSION 6
+#    define fuse_lowlevel_ops fuse_lowlevel_ops_compat25
+#    define fuse_lowlevel_new fuse_lowlevel_new_compat25
+#  else
+#    define FUSE_MINOR_VERSION 4
+#    define fuse_file_info fuse_file_info_compat
+#    define fuse_reply_statfs fuse_reply_statfs_compat
+#    define fuse_reply_open fuse_reply_open_compat
+#  endif
+#elif FUSE_USE_VERSION < 27
+#  error Compatibility with low level API version other than 24 and 25 not supported
 #endif
 
-#else /* __FreeBSD__ */
-
-#if FUSE_USE_VERSION < 25
-#  error On FreeBSD API version 25 or greater must be used
-#endif
-
-#endif /* __FreeBSD__ */
-
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3