From a4dfbfed89e26a766e30cca62c18e710eec81c3f Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Sat, 30 Sep 2023 18:51:36 +0200
Subject: [PATCH] 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 | 4 ++--
 src/os_unix.c | 1 -
 src/version.c | 2 ++
 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
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1964,
 /**/
     1963,
 /**/