Merge remote-tracking branch 'osxfuse/master' into merge-osxfuse

Pull in all changes from osxfuse's fork of sshfs into libfuse's sshfs.
There need not be two different copies of this codebase, particularly
because libfuse's version is already autoconf-ified and can support
multiple platforms.

The merge is mostly clean with just a few manual edits to resolve
conflicts.

1 files changed, 4 insertions, 0 deletions

diff --git a/cache.h b/cache.h
index cec9ca4..23ff970 100644
--- a/cache.h
+++ b/cache.h
@@ -27,3 +27,7 @@ int cache_parse_options(struct fuse_args *args);
 void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr);
 void cache_invalidate(const char *path);
 uint64_t cache_get_write_ctr(void);
+
+#if __APPLE__
+extern int cache_enabled;
+#endif