From 709dda5069dc7e5d14225f6c307c0d1b1d581151 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Fri, 26 Aug 2016 12:59:32 -0400 Subject: [PATCH 1/2] support systems without ENODATA --- src/xattr.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/xattr.hpp b/src/xattr.hpp index 07f8b03a..98f5c0ec 100644 --- a/src/xattr.hpp +++ b/src/xattr.hpp @@ -18,10 +18,18 @@ #include #endif -#ifndef ENOATTR +#if defined(ENODATA) && !defined(ENOATTR) #define ENOATTR ENODATA #endif +#if defined(ENOATTR) && !defined(ENODATA) +#define ENODATA ENOATTR +#endif + +#if !defined(ENOATTR) && !defined(ENODATA) +#error "Neither ENOATTR or ENODATA defined: please contact mergerfs author with platform information" +#endif + #ifndef XATTR_CREATE #define XATTR_CREATE 0x1 #endif From 2ee6b4f581f25924fd6171722cc12a6e1e433add Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Fri, 26 Aug 2016 13:09:15 -0400 Subject: [PATCH 2/2] include sys/types.h to pick up ssize_t --- src/fs_sendfile_unsupported.icpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fs_sendfile_unsupported.icpp b/src/fs_sendfile_unsupported.icpp index 87af18fd..853c9b99 100644 --- a/src/fs_sendfile_unsupported.icpp +++ b/src/fs_sendfile_unsupported.icpp @@ -15,6 +15,7 @@ */ #include +#include namespace fs {