diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fuse.c | 5 | ||||
| -rw-r--r-- | lib/fuse_lowlevel.c | 8 | ||||
| -rw-r--r-- | lib/fuse_session.c | 1 |
3 files changed, 9 insertions, 5 deletions
@@ -2777,6 +2777,7 @@ void fuse_destroy(struct fuse *f) fuse_delete_context_key(); } +#include "fuse_common_compat.h" #include "fuse_compat.h" static struct fuse *fuse_new_common_compat25(int fd, struct fuse_args *args, @@ -2802,7 +2803,7 @@ static int fuse_compat_open(struct fuse *f, fuse_req_t req, char *path, if (!f->compat || f->compat >= 25) err = fuse_do_open(f, req, path, fi); else if (f->compat == 22) { - struct fuse_file_info_compat22 tmp; + struct fuse_file_info_compat tmp; memcpy(&tmp, fi, sizeof(tmp)); fuse_prepare_interrupt(f, req, &d); err = ((struct fuse_operations_compat22 *) &f->op)->open(path, &tmp); @@ -2838,7 +2839,7 @@ static int fuse_compat_opendir(struct fuse *f, fuse_req_t req, char *path, return fuse_do_opendir(f, req, path, fi); } else { int err; - struct fuse_file_info_compat22 tmp; + struct fuse_file_info_compat tmp; struct fuse_intr_data d; memcpy(&tmp, fi, sizeof(tmp)); fuse_prepare_interrupt(f, req, &d); diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index e7044d3..27a3d20 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -1243,6 +1243,7 @@ struct fuse_session *fuse_lowlevel_new(struct fuse_args *args, } +#include "fuse_common_compat.h" #include "fuse_lowlevel_compat.h" #ifndef __FreeBSD__ @@ -1290,8 +1291,8 @@ int fuse_reply_statfs_compat(fuse_req_t req, const struct statfs *stbuf) } struct fuse_session *fuse_lowlevel_new_compat(const char *opts, - const struct fuse_lowlevel_ops *op, - size_t op_size, void *userdata) + const struct fuse_lowlevel_ops_compat *op, + size_t op_size, void *userdata) { struct fuse_session *se; struct fuse_args args = FUSE_ARGS_INIT(0, NULL); @@ -1303,7 +1304,8 @@ struct fuse_session *fuse_lowlevel_new_compat(const char *opts, fuse_opt_free_args(&args); return NULL; } - se = fuse_lowlevel_new(&args, op, op_size, userdata); + se = fuse_lowlevel_new(&args, (const struct fuse_lowlevel_ops *) op, + op_size, userdata); fuse_opt_free_args(&args); return se; diff --git a/lib/fuse_session.c b/lib/fuse_session.c index 6cfd462..73f5f57 100644 --- a/lib/fuse_session.c +++ b/lib/fuse_session.c @@ -7,6 +7,7 @@ */ #include "fuse_lowlevel.h" +#include "fuse_common_compat.h" #include "fuse_lowlevel_compat.h" #include <stdio.h> |