diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-01 15:01:09 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-02 02:13:49 +0200 |
| commit | e9d797e153ae95561dbb10b56a41281b2472f137 (patch) | |
| tree | 1a79b7c8d08352f7a9ead4c15b5c46d2a7f6aeaa /lib/replace/replace.h | |
| parent | f9b7cd53b9fe253b122cb545c2dd1be073ab0592 (diff) | |
| download | samba-e9d797e153ae95561dbb10b56a41281b2472f137.tar.gz samba-e9d797e153ae95561dbb10b56a41281b2472f137.tar.bz2 samba-e9d797e153ae95561dbb10b56a41281b2472f137.zip | |
lib/replace: Merge remaining xattr test details from lib/util
I prefer the longer XATTR_ADDITIONAL_OPTIONS define and the NULL
rather than 0 values in the getxattr test.
Andrew Bartlett
Diffstat (limited to 'lib/replace/replace.h')
| -rw-r--r-- | lib/replace/replace.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/replace/replace.h b/lib/replace/replace.h index fe3ef3dcfd..218303f296 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -543,42 +543,42 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) /* prototype is in "system/network.h" */ #endif -#if !defined(HAVE_GETXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_GETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define getxattr rep_getxattr /* prototype is in "system/filesys.h" */ #endif -#if !defined(HAVE_FGETXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_FGETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define fgetxattr rep_fgetxattr /* prototype is in "system/filesys.h" */ #endif -#if !defined(HAVE_LISTXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_LISTXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define listxattr rep_listxattr /* prototype is in "system/filesys.h" */ #endif -#if !defined(HAVE_FLISTXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_FLISTXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define flistxattr rep_flistxattr /* prototype is in "system/filesys.h" */ #endif -#if !defined(HAVE_REMOVEXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_REMOVEXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define removexattr rep_removexattr /* prototype is in "system/filesys.h" */ #endif -#if !defined(HAVE_FREMOVEXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_FREMOVEXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define fremovexattr rep_fremovexattr /* prototype is in "system/filesys.h" */ #endif -#if !defined(HAVE_SETXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_SETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define setxattr rep_setxattr /* prototype is in "system/filesys.h" */ #endif -#if !defined(HAVE_FSETXATTR) || defined(XATTR_ADD_OPT) +#if !defined(HAVE_FSETXATTR) || defined(XATTR_ADDITIONAL_OPTIONS) #define fsetxattr rep_fsetxattr /* prototype is in "system/filesys.h" */ #endif |