From: Miklos Szeredi <mszeredi@suse.cz>
Date: Wed, 17 Jul 2013 13:14:55 +0000 (+0200)
Subject: Merge https://github.com/qknight/fuse-fuse
X-Git-Tag: fuse-3.0.0pre0~110
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=95e71dd19ebf1ddf7e5285d21ba9001d44e30f7a;p=qemu-gpiodev%2Flibfuse.git

Merge https://github.com/qknight/fuse-fuse
---

95e71dd19ebf1ddf7e5285d21ba9001d44e30f7a
diff --cc include/fuse_lowlevel.h
index 500512f,ada5ce8..6075b03
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@@ -1656,8 -1733,20 +1661,12 @@@ void fuse_session_reset(struct fuse_ses
   */
  int fuse_session_exited(struct fuse_session *se);
  
 -/**
 - * Get the user data provided to the session
 - *
 - * @param se the session
 - * @return the user data
 - */
 -void *fuse_session_data(struct fuse_session *se);
 -
  /**
-  * Enter a single threaded event loop
+  * Enter a single threaded, blocking event loop.
+  *
 - * Using POSIX signals this event loop can be exited but the session 
++ * Using POSIX signals this event loop can be exited but the session
+  * needs to be configued by issuing: 
+  *   fuse_set_signal_handlers() first. 
   *
   * @param se the session
   * @return 0 on success, -1 on error
diff --cc lib/fuse_loop_mt.c
index b146d73,82e3001..b146d73
mode 100644,100755..100755
--- a/lib/fuse_loop_mt.c
+++ b/lib/fuse_loop_mt.c
diff --cc lib/fuse_lowlevel.c
index 76cb7b7,45cd5f3..76cb7b7
mode 100644,100755..100755
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c