Merge remote-tracking branch 'toybox/master' into HEAD am: 37852b74a7 am: 6e78ae7824

[android-x86/external-toybox.git] / lib / lsm.h

diff --git a/lib/lsm.h b/lib/lsm.h
index d7e7de9..e21d424 100644 (file)
--- a/lib/lsm.h
+++ b/lib/lsm.h
@@ -3,6 +3,8 @@
  * Copyright 2015 Rob Landley <rob@landley.net>
  */
 
+#include <sys/xattr.h>
+
 #if CFG_TOYBOX_SELINUX
 #include <selinux/selinux.h>
 #else
@@ -19,10 +21,11 @@
 
 #if CFG_TOYBOX_SMACK
 #include <sys/smack.h>
-#include <sys/xattr.h>
 #include <linux/xattr.h>
 #else
+#ifndef XATTR_NAME_SMACK
 #define XATTR_NAME_SMACK 0
+#endif
 //ssize_t fgetxattr (int fd, char *name, void *value, size_t size);
 #define smack_smackfs_path(...) (-1)
 #define smack_new_label_from_self(...) (-1)