summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-02-19 22:17:54 +0000
committerGerald Carter <jerry@samba.org>2004-02-19 22:17:54 +0000
commit95bc32e93ccda3adb4dc54fb20ed3216222006f9 (patch)
treeae0034fbc3566a69e0f7561e9c1343ca71bb3868
parent5fc9dd0be617f20ca848115cea2f754919ff81cc (diff)
downloadsamba-95bc32e93ccda3adb4dc54fb20ed3216222006f9.tar.gz
samba-95bc32e93ccda3adb4dc54fb20ed3216222006f9.tar.bz2
samba-95bc32e93ccda3adb4dc54fb20ed3216222006f9.zip
sys/xattr.h merge from HEAD
(This used to be commit 798dd7299e3ba5cd7e829f48bb42eb9cbfc71dd4)
-rw-r--r--source3/configure.in2
-rw-r--r--source3/include/includes.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 27d39d13ca..c32bd8fa78 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -624,7 +624,7 @@ AC_CHECK_HEADERS(shadow.h netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/
AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h security/pam_appl.h security/pam_modules.h)
AC_CHECK_HEADERS(stropts.h poll.h)
AC_CHECK_HEADERS(sys/capability.h syscall.h sys/syscall.h)
-AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/cdefs.h glob.h)
+AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/cdefs.h glob.h)
# For experimental utmp support (lastlog on some BSD-like systems)
AC_CHECK_HEADERS(utmp.h utmpx.h lastlog.h)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7f5c111682..65eebedc6c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -441,6 +441,10 @@
#include <attr/xattr.h>
#endif
+#if HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
+
#if HAVE_LOCALE_H
#include <locale.h>
#endif