diff options
author | Elliott Hughes <enh@google.com> | 2016-08-02 11:12:15 -0700 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2016-08-02 15:26:07 -0500 |
commit | 145b7024b5fbb74f16d5e403fb004ff8209bc4a0 (patch) | |
tree | 5274d46ae11901e73d760420df60e25397c0888c | |
parent | abf079b2d82cc3635863672371a2c53f8e940ba1 (diff) | |
download | toybox-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.)
-rw-r--r-- | lib/lsm.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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) |