Browse Source

misc fixes to compile on older platforms

pull/156/head
Antonio SJ Musumeci 9 years ago
parent
commit
58446f9124
  1. 2
      src/option_parser.cpp
  2. 2
      src/read_buf.cpp
  3. 19
      src/read_buf.hpp
  4. 17
      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("--help",MERGERFS_OPT_HELP),
FUSE_OPT_KEY("-v",MERGERFS_OPT_VERSION), FUSE_OPT_KEY("-v",MERGERFS_OPT_VERSION),
FUSE_OPT_KEY("--version",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" #include "fileinfo.hpp"
typedef struct fuse_bufvec fuse_bufvec;
static static
int int
_read_buf(const int fd, _read_buf(const int fd,

19
src/read_buf.hpp

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

17
src/write_buf.hpp

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