summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorRon Yorston2021-08-10 09:13:02 +0100
committerDenys Vlasenko2021-08-15 18:26:56 +0200
commit98cb561b5fd61fe37126fce7d557d5280c762b59 (patch)
tree89c3e25b43a31ed059a524c427d5529f54dd9a80 /coreutils
parent8ae6a4344d5d0f46e542d835ce4d218ff902c783 (diff)
downloadbusybox-98cb561b5fd61fe37126fce7d557d5280c762b59.zip
busybox-98cb561b5fd61fe37126fce7d557d5280c762b59.tar.gz
cp: fix build failure with long options disabled
When long options were disabled cp failed to compile with: coreutils/cp.c:130:9: error: empty enum is invalid 130 | }; | ^ Rearrange the conditional compilation to suit. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 50ca1cc..ee40af5 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -121,14 +121,12 @@ int cp_main(int argc, char **argv)
int d_flags;
int flags;
int status;
- enum {
#if ENABLE_FEATURE_CP_LONG_OPTIONS
+ enum {
/*OPT_rmdest = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTBITS */
OPT_parents = 1 << (FILEUTILS_CP_OPTBITS+1),
OPT_reflink = 1 << (FILEUTILS_CP_OPTBITS+2),
-#endif
};
-#if ENABLE_FEATURE_CP_LONG_OPTIONS
# if ENABLE_FEATURE_CP_REFLINK
char *reflink = NULL;
# endif