aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake.config/CMakeLists.txt4
-rw-r--r--src/nvim/os/fs.c2
-rw-r--r--test/old/testdir/test_writefile.vim1
3 files changed, 5 insertions, 2 deletions
diff --git a/cmake.config/CMakeLists.txt b/cmake.config/CMakeLists.txt
index 85d49e330e..1b175475ee 100644
--- a/cmake.config/CMakeLists.txt
+++ b/cmake.config/CMakeLists.txt
@@ -36,11 +36,13 @@ check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)
# Headers
check_include_files(langinfo.h HAVE_LANGINFO_H)
check_include_files(strings.h HAVE_STRINGS_H)
-check_include_files(attr/xattr.h HAVE_XATTR)
check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
check_include_files(termios.h HAVE_TERMIOS_H)
check_include_files(sys/uio.h HAVE_SYS_UIO_H)
check_include_files(sys/sdt.h HAVE_SYS_SDT_H)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ check_include_files(sys/xattr.h HAVE_XATTR)
+endif()
# Functions
check_function_exists(fseeko HAVE_FSEEKO)
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 3efb575039..93cc7de040 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -30,7 +30,7 @@
#endif
#ifdef HAVE_XATTR
-# include <attr/xattr.h>
+# include <sys/xattr.h>
# define XATTR_VAL_LEN 1024
#endif
diff --git a/test/old/testdir/test_writefile.vim b/test/old/testdir/test_writefile.vim
index 62ec901dbf..df993feb62 100644
--- a/test/old/testdir/test_writefile.vim
+++ b/test/old/testdir/test_writefile.vim
@@ -992,6 +992,7 @@ endfunc
func Test_write_with_xattr_support()
CheckLinux
+ CheckFeature xattr
CheckExecutable setfattr
let contents = ["file with xattrs", "line two"]