diff options
| author | Ralph Boehme <slow@samba.org> | 2019-12-12 10:46:21 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-12-12 20:22:51 +0000 |
| commit | 48ed60d7fd0b567c2450020b8ccaa2c6ff8913e3 (patch) | |
| tree | f95f57ba0d3d6a76a246d877a2749d272dafc7dc /lib/replace | |
| parent | 82aff583b7f7e018ad4a1db92dc635df8e5ebe7b (diff) | |
| download | samba-48ed60d7fd0b567c2450020b8ccaa2c6ff8913e3.tar.gz | |
lib/replace: work around an API conflict between ncurses and XFS xattr API
Compile error:
[4530/4693] Compiling source3/utils/regedit_list.c
In file included from ../../source3/utils/regedit_list.h:24,
from ../../source3/utils/regedit_list.c:20:
/usr/include/curses.h:611:28: error: conflicting types for ‘attr_get’
611 | extern NCURSES_EXPORT(int) attr_get (attr_t *, NCURSES_PAIRS_T *, void *); /* generated */
| ^~~~~~~~
compilation terminated due to -Wfatal-errors.
Both ncurses and XFS xattr API provide a get_attr() function. As a workaround
avoid including <sys|attr/attributes.h> if <attr|sys/xattr.h> is present.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Dec 12 20:22:51 UTC 2019 on sn-devel-184
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/system/filesys.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h index 1a8cb68103d..afde4eacb39 100644 --- a/lib/replace/system/filesys.h +++ b/lib/replace/system/filesys.h @@ -107,17 +107,15 @@ #include <sys/uio.h> #endif -#if defined(HAVE_SYS_ATTRIBUTES_H) -#include <sys/attributes.h> -#elif defined(HAVE_ATTR_ATTRIBUTES_H) -#include <attr/attributes.h> -#endif - /* mutually exclusive (SuSE 8.2) */ #if defined(HAVE_ATTR_XATTR_H) #include <attr/xattr.h> #elif defined(HAVE_SYS_XATTR_H) #include <sys/xattr.h> +#elif defined(HAVE_SYS_ATTRIBUTES_H) +#include <sys/attributes.h> +#elif defined(HAVE_ATTR_ATTRIBUTES_H) +#include <attr/attributes.h> #endif #ifdef HAVE_SYS_EA_H |