commit a4dfbfed89e26a766e30cca62c18e710eec81c3f
author Christian Brabandt <cb@256bit.org> Sat Sep 30 18:51:36 2023 +0200
committer Christian Brabandt <cb@256bit.org> Sat Sep 30 18:51:36 2023 +0200
tree 85f7fdac18cd7975cb338d50ca59d58c0d7ea06e
parent 6de4e58cf27a3bb6e81653ca63b77e29d1bb46f2

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>

src/feature.h

diff --git a/src/feature.h b/src/feature.h
index b26dc6c..5fcd727 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

src/os_unix.c

diff --git a/src/os_unix.c b/src/os_unix.c
index 50acd5a..5ec45c8 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -37,7 +37,6 @@
 
 #ifdef FEAT_XATTR
 # include <sys/xattr.h>
-# define XATTR_VAL_LEN 1024
 #endif
 
 #ifdef HAVE_SMACK

src/version.c

diff --git a/src/version.c b/src/version.c
index f918ad8..0c65d7b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1964,
+/**/
     1963,
 /**/
     1962,