Merge master

[netatalk.git] / include / atalk / ea.h

diff --git a/include/atalk/ea.h b/include/atalk/ea.h
index 2f884e6164017e6a932798658ca6c77e51a01ed4..f26e32b288f0171058159a9979f5474465175039 100644 (file)
--- a/include/atalk/ea.h
+++ b/include/atalk/ea.h
@@ -19,10 +19,28 @@
 #include <config.h>
 #endif
 
+#if HAVE_ATTR_XATTR_H
+#include <attr/xattr.h>
+#elif HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
+
+#ifdef HAVE_SYS_EA_H
+#include <sys/ea.h>
+#endif
+
+#ifdef HAVE_SYS_EXTATTR_H
+#include <sys/extattr.h>
+#endif
+
 #ifdef HAVE_SOLARIS_ACLS
 #include <sys/acl.h>
 #endif
 
+#ifndef ENOATTR
+#define ENOATTR ENODATA
+#endif
+
 #include <atalk/vfs.h>
 
 /*
@@ -58,6 +76,7 @@ enum {
 /* Names for our Extended Attributes adouble data */
 #define AD_EA_META "org.netatalk.Metadata"
 #define AD_EA_RESO "org.netatalk.ResourceFork"
+#define NOT_NETATALK_EA(a) (strcmp((a), AD_EA_META) != 0) && (strcmp((a), AD_EA_RESO) != 0)
 
 /****************************************************************************************
  * Wrappers for native EA functions taken from Samba