aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-08-02 11:12:15 -0700
committerRob Landley <rob@landley.net>2016-08-02 15:26:07 -0500
commit145b7024b5fbb74f16d5e403fb004ff8209bc4a0 (patch)
tree5274d46ae11901e73d760420df60e25397c0888c /lib
parentabf079b2d82cc3635863672371a2c53f8e940ba1 (diff)
downloadtoybox-145b7024b5fbb74f16d5e403fb004ff8209bc4a0.tar.gz
Fix warning: 'XATTR_NAME_SMACK' macro redefined.
Recent Linux uapi <linux/xattr.h> headers define XATTR_NAME_SMACK. The <sys/xattr.h> include at the top of lib/lsm.h means that even though the direct include of <linux/xattr.h> is guarded, it may have already happened transitively anyway. (The alternative fixes would be to hard-code the correct value for XATTR_NAME_SMACK here instead, or #undef XATTR_NAME_SMACK.)
Diffstat (limited to 'lib')
-rw-r--r--lib/lsm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/lsm.h b/lib/lsm.h
index 3a5b7ebf..e21d424b 100644
--- a/lib/lsm.h
+++ b/lib/lsm.h
@@ -23,7 +23,9 @@
#include <sys/smack.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)