From 58446f912452248e704fa8a8cb6b2b1566e23817 Mon Sep 17 00:00:00 2001
From: Antonio SJ Musumeci <trapexit@spawn.link>
Date: Mon, 12 Oct 2015 19:51:57 -0400
Subject: [PATCH] misc fixes to compile on older platforms

---
 src/option_parser.cpp |  2 +-
 src/read_buf.cpp      |  2 ++
 src/read_buf.hpp      | 19 ++++++++++++++-----
 src/write_buf.hpp     | 17 +++++++++++++----
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/option_parser.cpp b/src/option_parser.cpp
index 4e1b8349..ae1e54cf 100644
--- a/src/option_parser.cpp
+++ b/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}
         };
 
 
diff --git a/src/read_buf.cpp b/src/read_buf.cpp
index 30b41d37..b7ba44be 100644
--- a/src/read_buf.cpp
+++ b/src/read_buf.cpp
@@ -32,6 +32,8 @@
 
 #include "fileinfo.hpp"
 
+typedef struct fuse_bufvec fuse_bufvec;
+
 static
 int
 _read_buf(const int      fd,
diff --git a/src/read_buf.hpp b/src/read_buf.hpp
index 76b89b7a..35a00aca 100644
--- a/src/read_buf.hpp
+++ b/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,
-             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
diff --git a/src/write_buf.hpp b/src/write_buf.hpp
index 8bbae088..595ec823 100644
--- a/src/write_buf.hpp
+++ b/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,
-              off_t           offset,
-              fuse_file_info *fi);
+    write_buf(const char         *fusepath,
+              struct fuse_bufvec *buf,
+              off_t               offset,
+              fuse_file_info     *fi);
   }
 }
+
+#endif