diff options
| author | Andres Mejia <amejia004@gmail.com> | 2013-02-07 16:57:22 -0500 |
|---|---|---|
| committer | Andres Mejia <amejia004@gmail.com> | 2013-02-07 16:57:22 -0500 |
| commit | 97bf284c9bd540c6dca7c2e5c23129d460a24ccd (patch) | |
| tree | c4b86a9b1c29c234ce008c7b25d99a2661feead5 | |
| parent | c2b9d5f681e8407996610bbc86780de45525e232 (diff) | |
| download | libarchive-97bf284c9bd540c6dca7c2e5c23129d460a24ccd.tar.gz | |
Fix warnings about redefinition of variables, use either sys/xattr.h or attr/xattr.h.
| -rw-r--r-- | libarchive/archive_read_disk_entry_from_file.c | 7 | ||||
| -rw-r--r-- | libarchive/archive_write_disk_posix.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c index a2d8d6b3..e984aaad 100644 --- a/libarchive/archive_read_disk_entry_from_file.c +++ b/libarchive/archive_read_disk_entry_from_file.c @@ -49,8 +49,10 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk_entry_from_file.c 2010 #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#ifdef HAVE_SYS_XATTR_H +#if defined(HAVE_SYS_XATTR_H) #include <sys/xattr.h> +#elif defined(HAVE_ATTR_XATTR_H) +#include <attr/xattr.h> #endif #ifdef HAVE_SYS_EA_H #include <sys/ea.h> @@ -58,9 +60,6 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk_entry_from_file.c 2010 #ifdef HAVE_ACL_LIBACL_H #include <acl/libacl.h> #endif -#ifdef HAVE_ATTR_XATTR_H -#include <attr/xattr.h> -#endif #ifdef HAVE_COPYFILE_H #include <copyfile.h> #endif diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c index aaae7202..bbd50a63 100644 --- a/libarchive/archive_write_disk_posix.c +++ b/libarchive/archive_write_disk_posix.c @@ -39,15 +39,14 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_SYS_EXTATTR_H #include <sys/extattr.h> #endif -#ifdef HAVE_SYS_XATTR_H +#if defined(HAVE_SYS_XATTR_H) #include <sys/xattr.h> +#elif defined(HAVE_ATTR_XATTR_H) +#include <attr/xattr.h> #endif #ifdef HAVE_SYS_EA_H #include <sys/ea.h> #endif -#ifdef HAVE_ATTR_XATTR_H -#include <attr/xattr.h> -#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif |