diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-06-16 15:37:52 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-06-16 18:54:26 +0200 |
| commit | 8283d9ec4a2d39b3d6f06ad9e98c22a26e78317f (patch) | |
| tree | 4e9df03fbd7885df7de8d739d8b451cdff6e6d54 /lib | |
| parent | bd45745b09380c1fa6d0fd32929bd298fdaa4146 (diff) | |
| download | samba-8283d9ec4a2d39b3d6f06ad9e98c22a26e78317f.tar.gz samba-8283d9ec4a2d39b3d6f06ad9e98c22a26e78317f.tar.bz2 samba-8283d9ec4a2d39b3d6f06ad9e98c22a26e78317f.zip | |
attr: Look for attr/attributes.h too.
Fixes finding of ATTR_ROOT on GNU/kFreeBSD.
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Sat Jun 16 18:54:27 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/system/filesys.h | 2 | ||||
| -rw-r--r-- | lib/replace/wscript | 2 | ||||
| -rw-r--r-- | lib/replace/xattr.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h index 493d87d7d4..c8ac2b4f74 100644 --- a/lib/replace/system/filesys.h +++ b/lib/replace/system/filesys.h @@ -114,6 +114,8 @@ #if HAVE_SYS_ATTRIBUTES_H #include <sys/attributes.h> +#elif HAVE_ATTR_ATTRIBUTES_H +#include <attr/attributes.h> #endif /* mutually exclusive (SuSE 8.2) */ diff --git a/lib/replace/wscript b/lib/replace/wscript index 7e4055ba9a..68138cf8ed 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -43,7 +43,7 @@ def configure(conf): conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c index 07c130f9f8..8e1c989a3d 100644 --- a/lib/replace/xattr.c +++ b/lib/replace/xattr.c @@ -252,7 +252,7 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg, char *list, size_t size #endif -#if defined(HAVE_ATTR_LIST) && defined(HAVE_SYS_ATTRIBUTES_H) +#if defined(HAVE_ATTR_LIST) && (defined(HAVE_SYS_ATTRIBUTES_H) || defined(HAVE_ATTR_ATTRIBUTES_H)) static char attr_buffer[ATTR_MAX_VALUELEN]; static ssize_t irix_attr_list(const char *path, int filedes, char *list, size_t size, int flags) |