diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fuse.c | 9 | ||||
| -rw-r--r-- | lib/fuse_versionscript | 5 | ||||
| -rw-r--r-- | lib/helper.c | 4 |
3 files changed, 8 insertions, 10 deletions
@@ -4923,12 +4923,11 @@ void fuse_stop_cleanup_thread(struct fuse *f) * Not supposed to be called directly, but supposed to be called * through the fuse_new macro */ -struct fuse *_fuse_new_317(struct fuse_args *args, +struct fuse *_fuse_new_31(struct fuse_args *args, const struct fuse_operations *op, size_t op_size, struct libfuse_version *version, void *user_data); -FUSE_SYMVER("_fuse_new_317", "_fuse_new@@FUSE_3.17") -struct fuse *_fuse_new_317(struct fuse_args *args, +struct fuse *_fuse_new_31(struct fuse_args *args, const struct fuse_operations *op, size_t op_size, struct libfuse_version *version, void *user_data) @@ -5103,7 +5102,7 @@ struct fuse *_fuse_new_30(struct fuse_args *args, fuse_lib_help(args); return NULL; } else - return _fuse_new_317(args, op, op_size, version, user_data); + return _fuse_new_31(args, op, op_size, version, user_data); } /* ABI compat version */ @@ -5117,7 +5116,7 @@ struct fuse *fuse_new_31(struct fuse_args *args, /* unknown version */ struct libfuse_version version = { 0 }; - return _fuse_new_317(args, op, op_size, &version, user_data); + return _fuse_new_31(args, op, op_size, &version, user_data); } /* diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript index 2d314c0..6c5fc83 100644 --- a/lib/fuse_versionscript +++ b/lib/fuse_versionscript @@ -191,9 +191,8 @@ FUSE_3.17 { global: fuse_main_real_versioned; fuse_session_new_versioned; -#if !defined(LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS) - _fuse_new_317; -#endif + _fuse_new_30; + _fuse_new_31; fuse_passthrough_open; fuse_passthrough_close; fuse_session_custom_io_30; diff --git a/lib/helper.c b/lib/helper.c index cab5ada..a1cf98c 100644 --- a/lib/helper.c +++ b/lib/helper.c @@ -346,11 +346,11 @@ int fuse_main_real_versioned(int argc, char *argv[], goto out1; } - struct fuse *_fuse_new(struct fuse_args *args, + struct fuse *_fuse_new_31(struct fuse_args *args, const struct fuse_operations *op, size_t op_size, struct libfuse_version *version, void *user_data); - fuse = _fuse_new(&args, op, op_size, version, user_data); + fuse = _fuse_new_31(&args, op, op_size, version, user_data); if (fuse == NULL) { res = 3; goto out1; |