diff options
| author | Rob Landley <rob@landley.net> | 2016-03-12 15:56:40 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-03-12 15:56:40 -0600 |
| commit | 2f7c98e109b04b060649f37d5f0be67e2bd2228b (patch) | |
| tree | 16bf9a04c87b24741337e0cd9e602309d2a00047 | |
| parent | 96a5ed118ce8ad1aaf7889b9eff599bb4517aa49 (diff) | |
| download | toybox-2f7c98e109b04b060649f37d5f0be67e2bd2228b.tar.gz | |
The xattr functions were added during the 2.5 kernel, lsm.h can #include the
header unconditionally. (This fixes the warning when CP_PRESERVE disabled.)
| -rw-r--r-- | lib/lsm.h | 3 | ||||
| -rw-r--r-- | toys/posix/cp.c | 4 |
2 files changed, 2 insertions, 5 deletions
@@ -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,7 +21,6 @@ #if CFG_TOYBOX_SMACK #include <sys/smack.h> -#include <sys/xattr.h> #include <linux/xattr.h> #else #define XATTR_NAME_SMACK 0 diff --git a/toys/posix/cp.c b/toys/posix/cp.c index 0e6a2efa..32502656 100644 --- a/toys/posix/cp.c +++ b/toys/posix/cp.c @@ -107,9 +107,6 @@ config INSTALL #define FOR_cp #include "toys.h" -#if CFG_CP_PRESERVE -#include <sys/xattr.h> -#endif GLOBALS( union { @@ -404,7 +401,6 @@ void cp_main(void) // Loop through sources for (i=0; i<toys.optc; i++) { - struct dirtree *new; char *src = toys.optargs[i]; int rc = 1; |