diff options
| author |  Miklos Szeredi <mszeredi@suse.cz> | 2013-08-26 12:11:42 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2013-08-26 12:11:42 +0200 |
| commit | e6bc9048574d1de7ae8f6249c7099e429991b45f (patch) | |
| tree | b27e80202c54bf7cbd5d080db31157e3b2827a16 | |
| parent | f4bb7265fddf8c7e1f186d53f1e07fdccfbe8d00 (diff) | |
| parent | 78bc1108d5537400f7df7f79f1dc27084b53323c (diff) | |
Merge remote-tracking branch 'origin/fuse_2_9_bugfix'
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fuse.c | 1 | ||||
| -rwxr-xr-x | lib/fuse_lowlevel.c | 1 | ||||
| -rw-r--r-- | lib/mount_util.c | 1 | ||||
| -rw-r--r-- | util/fusermount.c | 1 |
5 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2013-08-26 Miklos Szeredi <miklos@szeredi.hu> + + * libfuse: Add missing includes. This allows compiling fuse with + musl. Patch by Daniel Thau + 2013-07-26 Miklos Szeredi <miklos@szeredi.hu> * Print help on stdout instead of stderr @@ -35,6 +35,7 @@ #include <sys/uio.h> #include <sys/time.h> #include <sys/mman.h> +#include <sys/file.h> #define FUSE_NODE_SLAB 1 diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 0f1c3d3..2b8df06 100755 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -22,6 +22,7 @@ #include <limits.h> #include <errno.h> #include <assert.h> +#include <sys/file.h> #ifndef F_LINUX_SPECIFIC_BASE #define F_LINUX_SPECIFIC_BASE 1024 diff --git a/lib/mount_util.c b/lib/mount_util.c index 4415aa1..87e3888 100644 --- a/lib/mount_util.c +++ b/lib/mount_util.c @@ -17,6 +17,7 @@ #include <errno.h> #include <fcntl.h> #include <limits.h> +#include <paths.h> #ifndef __NetBSD__ #include <mntent.h> #endif diff --git a/util/fusermount.c b/util/fusermount.c index 2973762..e7dbca6 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -20,6 +20,7 @@ #include <errno.h> #include <fcntl.h> #include <pwd.h> +#include <paths.h> #include <mntent.h> #include <sys/wait.h> #include <sys/stat.h> |