patch 9.0.1964: xattr support fails to build on MacOS X

Commit: 
https://github.com/vim/vim/commit/a4dfbfed89e26a766e30cca62c18e710eec81c3f
Author: Christian Brabandt <c...@256bit.org>
Date:   Sat Sep 30 18:51:36 2023 +0200

    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 <c...@256bit.org>

diff --git a/src/feature.h b/src/feature.h
index b26dc6ccf..5fcd727a9 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 50acd5a0c..5ec45c8ff 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 f918ad896..0c65d7b73 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,
 /**/

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/E1qmdJz-001PfN-QH%40256bit.org.

Raspunde prin e-mail lui