diff options
| author | Przemyslaw Pawelczyk <przemoc@gmail.com> | 2015-09-02 23:32:01 +0200 |
|---|---|---|
| committer | Przemyslaw Pawelczyk <przemoc@gmail.com> | 2015-09-02 23:32:01 +0200 |
| commit | c7e8ae67a35a6b578f9a756a59256d8c8933a046 (patch) | |
| tree | ad836113c7fa6e770b753a066a81b67fd2f6cbff | |
| parent | 76760ad49ac9efdf3980cae2e816f899986f5eeb (diff) | |
| parent | 3c3d9053ea088b160ac7c36c27960da254fba976 (diff) | |
Merge branch 'impro/switch-xattr-header'
Conflicts:
NEWS
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | metaentry.c | 3 | ||||
| -rw-r--r-- | metastore.c | 3 |
4 files changed, 9 insertions, 2 deletions
@@ -9,6 +9,7 @@ Current maintainer of unofficial metastore continuation is: All other direct and indirect source code contributors are: Sergio Callegari <sergio.callegari@gmail.com> + Ken Dawson <dawsonwu@rahul.net> Dan Fandrich <dan@coneharvesters.com> Romain Francoise <rfrancoise@debian.org> Joey Hess <joey@kodama.kitenet.net> @@ -7,6 +7,10 @@ Latest stuff (planned release date: 2015-09-??) * Scripts in example/ directory do not require bash anymore and there is a new example for post checkout hook. + * Dependency on libattr's xattr.h header has been removed. + As long as your libc provides sys/xattr.h (glibc does it since v2.3), + everything should be fine. + Old times (2007-2014) ------------------------------------------------------------------------ diff --git a/metaentry.c b/metaentry.c index 1f45fca..3ed37e8 100644 --- a/metaentry.c +++ b/metaentry.c @@ -25,13 +25,14 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include <attr/xattr.h> +#include <sys/xattr.h> #include <limits.h> #include <dirent.h> #include <sys/mman.h> #include <utime.h> #include <fcntl.h> #include <stdint.h> +#include <errno.h> #include "metastore.h" #include "metaentry.h" diff --git a/metastore.c b/metastore.c index 82aabc5..38901de 100644 --- a/metastore.c +++ b/metastore.c @@ -23,10 +23,11 @@ #include <sys/stat.h> #include <getopt.h> #include <utime.h> -#include <attr/xattr.h> +#include <sys/xattr.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <errno.h> #include "metastore.h" #include "settings.h" |