Browse Source

Merge pull request #156 from trapexit/cisms

misc fixes to compile on older platforms
pull/157/head
Antonio SJ Musumeci 9 years ago
parent
commit
3ccc94a560
  1. 2
      src/option_parser.cpp
  2. 2
      src/read_buf.cpp
  3. 11
      src/read_buf.hpp
  4. 11
      src/write_buf.hpp

2
src/option_parser.cpp

@ -334,7 +334,7 @@ namespace mergerfs
FUSE_OPT_KEY("--help",MERGERFS_OPT_HELP),
FUSE_OPT_KEY("-v",MERGERFS_OPT_VERSION),
FUSE_OPT_KEY("--version",MERGERFS_OPT_VERSION),
FUSE_OPT_END
{NULL,-1U,0}
};

2
src/read_buf.cpp

@ -32,6 +32,8 @@
#include "fileinfo.hpp"
typedef struct fuse_bufvec fuse_bufvec;
static
int
_read_buf(const int fd,

11
src/read_buf.hpp

@ -22,15 +22,24 @@
THE SOFTWARE.
*/
#ifndef __READ_BUF_HPP__
#define __READ_BUF_HPP__
#include <fuse.h>
#include <sys/types.h>
namespace mergerfs
{
namespace fuse
{
int
read_buf(const char *fusepath,
fuse_bufvec **buf,
struct fuse_bufvec **buf,
size_t size,
off_t offset,
fuse_file_info *fi);
}
}
#endif

11
src/write_buf.hpp

@ -22,14 +22,23 @@
THE SOFTWARE.
*/
#ifndef __WRITE_BUF_HPP__
#define __WRITE_BUF_HPP__
#include <fuse.h>
#include <sys/types.h>
namespace mergerfs
{
namespace fuse
{
int
write_buf(const char *fusepath,
fuse_bufvec *buf,
struct fuse_bufvec *buf,
off_t offset,
fuse_file_info *fi);
}
}
#endif
Loading…
Cancel
Save