patch 9.0.1964: xattr support fails to build on MacOS X

Problem:  xattr support fails to build on MacOS X
Solution: Disable xattr support for MacOS X

MacOS X uses the same headers and functions sys/xattr.h but the function
signatures for xattr support are much different, so building fails.

So let's for now disable xattr support there.

closes: #13230
closes: #13232

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/feature.h b/src/feature.h
index b26dc6ccf187c42b8971f67c6001f645afd813c8..5fcd727a9eaeb148d34e406fe52438613c739839 100644 (file)
--- 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 50acd5a0c564165d104958b697e69dc83649037b..5ec45c8ff01febd1f5254e8b26fb6ab394456527 100644 (file)
--- 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 f918ad896fca8e25edace5c68ede4ef1708ebfe0..0c65d7b73ad7f2bd665b839e47fd527cce4ea401 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1964,
 /**/
     1963,
 /**/