Skip to content

Commit a4dfbfe

Browse files
committed
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 <[email protected]>
1 parent 6de4e58 commit a4dfbfe

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/feature.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,9 +1177,9 @@
11771177
#endif
11781178

11791179
/*
1180-
* XATTR support
1180+
* currently Unix only: XATTR support
11811181
*/
11821182

1183-
#if defined(FEAT_NORMAL) && defined(HAVE_XATTR)
1183+
#if defined(FEAT_NORMAL) && defined(HAVE_XATTR) && !defined(MACOS_X)
11841184
# define FEAT_XATTR
11851185
#endif

src/os_unix.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ static int selinux_enabled = -1;
3737

3838
#ifdef FEAT_XATTR
3939
# include <sys/xattr.h>
40-
# define XATTR_VAL_LEN 1024
4140
#endif
4241

4342
#ifdef HAVE_SMACK

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1964,
707709
/**/
708710
1963,
709711
/**/

0 commit comments

Comments
 (0)