summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/feature.h4
-rw-r--r--src/os_unix.c1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/feature.h b/src/feature.h
index b26dc6ccf1..5fcd727a9e 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1177,9 +1177,9 @@
#endif
/*
- * XATTR support
+ * currently Unix only: XATTR support
*/
-#if defined(FEAT_NORMAL) && defined(HAVE_XATTR)
+#if defined(FEAT_NORMAL) && defined(HAVE_XATTR) && !defined(MACOS_X)
# define FEAT_XATTR
#endif
diff --git a/src/os_unix.c b/src/os_unix.c
index 50acd5a0c5..5ec45c8ff0 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -37,7 +37,6 @@ static int selinux_enabled = -1;
#ifdef FEAT_XATTR
# include <sys/xattr.h>
-# define XATTR_VAL_LEN 1024
#endif
#ifdef HAVE_SMACK
diff --git a/src/version.c b/src/version.c
index f918ad896f..0c65d7b73a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1964,
+/**/
1963,
/**/
1962,