mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
Fix include for xattr.h
The proper file that should be included is `sys/xattr.h` as that comes from `glibc` and not `attr/xattr.h` which ships with the `attr` utility. New enough `attr` utility (at least 2.4.48 in my case) even includes a #warning in `attr/xattr.h` for projects that still have this mistake in the code.
This commit is contained in:
committed by
Richard W.M. Jones
parent
724d7877f8
commit
d3478036a8
@@ -37,12 +37,8 @@
|
|||||||
|
|
||||||
#ifdef HAVE_LINUX_XATTRS
|
#ifdef HAVE_LINUX_XATTRS
|
||||||
|
|
||||||
# ifdef HAVE_ATTR_XATTR_H
|
# ifdef HAVE_SYS_XATTR_H
|
||||||
# include <attr/xattr.h>
|
# include <sys/xattr.h>
|
||||||
# else
|
|
||||||
# ifdef HAVE_SYS_XATTR_H
|
|
||||||
# include <sys/xattr.h>
|
|
||||||
# endif
|
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|||||||
@@ -41,13 +41,9 @@
|
|||||||
#include <acl/libacl.h>
|
#include <acl/libacl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_ATTR_XATTR_H
|
|
||||||
#include <attr/xattr.h>
|
|
||||||
#else
|
|
||||||
#ifdef HAVE_SYS_XATTR_H
|
#ifdef HAVE_SYS_XATTR_H
|
||||||
#include <sys/xattr.h>
|
#include <sys/xattr.h>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <guestfs.h>
|
#include <guestfs.h>
|
||||||
#include "guestfs-utils.h"
|
#include "guestfs-utils.h"
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_FUSE
|
#if HAVE_FUSE
|
||||||
/* See <attr/xattr.h> */
|
/* See <sys/xattr.h> */
|
||||||
#ifndef ENOATTR
|
#ifndef ENOATTR
|
||||||
#define ENOATTR ENODATA
|
#define ENOATTR ENODATA
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
|
|||||||
|
|
||||||
dnl Headers.
|
dnl Headers.
|
||||||
AC_CHECK_HEADERS([\
|
AC_CHECK_HEADERS([\
|
||||||
attr/xattr.h \
|
|
||||||
byteswap.h \
|
byteswap.h \
|
||||||
endian.h \
|
endian.h \
|
||||||
sys/endian.h \
|
sys/endian.h \
|
||||||
|
|||||||
Reference in New Issue
Block a user