aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar userwithuid <userwithuid@gmail.com>2017-08-14 15:08:41 +0000
committerGravatar Nikolaus Rath <Nikolaus@rath.org>2017-08-14 20:02:28 +0200
commit811c808b1d28bdea7a1b0bb0e5bafb9dfbe9b3bb (patch)
tree1c73c4b3904a6f5de50a8f06b99bcd2e2afb64f6
parenta42e548d76ced251f65f769374c3c3984d1c219e (diff)
directly call fuse_new_31() instead of fuse_new() internally
this fixes building with lto, which failed since commit 503e32d01e4db00e90d7acfd81ab05386559069f
-rw-r--r--ChangeLog.rst2
-rw-r--r--lib/fuse.c2
-rw-r--r--lib/fuse_i.h3
-rw-r--r--lib/helper.c2
4 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 882e6f0..ee1941e 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -9,6 +9,8 @@ Unreleased Changes
* Fixed installation directory for udev rules.
+* Fixed compilation with LTO.
+
libfuse 3.1.1 (2017-08-06)
==========================
diff --git a/lib/fuse.c b/lib/fuse.c
index 2322a8b..b013072 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4629,8 +4629,6 @@ void fuse_stop_cleanup_thread(struct fuse *f)
/* Explicit prototype to prevent compiler warnings
(fuse.h only defines fuse_new()) */
-struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op,
- size_t op_size, void *private_data);
FUSE_SYMVER(".symver fuse_new_31,fuse_new@@FUSE_3.1");
struct fuse *fuse_new_31(struct fuse_args *args,
const struct fuse_operations *op,
diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index 54466f6..80849ec 100644
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -125,3 +125,6 @@ int fuse_session_receive_buf_int(struct fuse_session *se, struct fuse_buf *buf,
struct fuse_chan *ch);
void fuse_session_process_buf_int(struct fuse_session *se,
const struct fuse_buf *buf, struct fuse_chan *ch);
+
+struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op,
+ size_t op_size, void *private_data);
diff --git a/lib/helper.c b/lib/helper.c
index 9abc6dd..9d26c14 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -302,7 +302,7 @@ int fuse_main_real(int argc, char *argv[], const struct fuse_operations *op,
}
- fuse = fuse_new(&args, op, op_size, user_data);
+ fuse = fuse_new_31(&args, op, op_size, user_data);
if (fuse == NULL) {
res = 1;
goto out1;