fix

1 files changed, 13 insertions, 6 deletions

diff --git a/include/fuse.h b/include/fuse.h
index 8a0fd3c..a5115ee 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -50,11 +50,8 @@ typedef struct fuse_dirhandle *fuse_dirh_t;
  *            not specified
  * @return 0 on success, -errno on error
  */
-typedef int (*fuse_dirfil2_t) (fuse_dirh_t h, const char *name, int type,
-                               ino_t ino);
-
-/** Obsolete version of the above function */
-typedef int (*fuse_dirfil_t) (fuse_dirh_t h, const char *name, int type);
+typedef int (*fuse_dirfil_t) (fuse_dirh_t h, const char *name, int type,
+                              ino_t ino);
 
 /**
  * The file system operations:
@@ -116,7 +113,7 @@ typedef int (*fuse_dirfil_t) (fuse_dirh_t h, const char *name, int type);
 struct fuse_operations {
     int (*getattr)     (const char *, struct stat *);
     int (*readlink)    (const char *, char *, size_t);
-    int (*getdir)      (const char *, fuse_dirh_t, fuse_dirfil2_t);
+    int (*getdir)      (const char *, fuse_dirh_t, fuse_dirfil_t);
     int (*mknod)       (const char *, mode_t, dev_t);
     int (*mkdir)       (const char *, mode_t);
     int (*unlink)      (const char *);
@@ -294,6 +291,16 @@ int __fuse_loop_mt(struct fuse *f, fuse_processor_t proc, void *data);
 int __fuse_exited(struct fuse* f);
 void __fuse_set_getcontext_func(struct fuse_context *(*func)(void));
 
+
+/* ----------------------------------------------------------- *
+ * Compatibility cruft                                         *
+ * ----------------------------------------------------------- */
+
+#ifdef FUSE_DIRFIL_COMPAT
+typedef int (*fuse_dirfil_old_t) (fuse_dirh_t h, const char *name, int type);
+#define fuse_dirfil_t fuse_dirfil_old_t
+#endif
+
 #ifdef __cplusplus
 }
 #endif