diff options
| author | Ron Yorston <rmy@pobox.com> | 2018-09-10 14:37:07 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2018-09-10 14:59:33 +0100 |
| commit | d89ced75b204f0eb5611f522864beb81d1b393f5 (patch) | |
| tree | 5daa31427e287fe079a0ef551097753773fdb266 /coreutils/cp.c | |
| parent | f72845d9332fa6311a46dbcad3180d5008182982 (diff) | |
| parent | 05b18065ab9c375f6185b65a3631d4c6cc1a4be9 (diff) | |
| download | busybox-w32-d89ced75b204f0eb5611f522864beb81d1b393f5.tar.gz busybox-w32-d89ced75b204f0eb5611f522864beb81d1b393f5.tar.bz2 busybox-w32-d89ced75b204f0eb5611f522864beb81d1b393f5.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/cp.c')
| -rw-r--r-- | coreutils/cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c index ae60623d3..b26c0e954 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
| @@ -114,7 +114,7 @@ int cp_main(int argc, char **argv) | |||
| 114 | # endif | 114 | # endif |
| 115 | ); | 115 | ); |
| 116 | # if ENABLE_FEATURE_CP_REFLINK | 116 | # if ENABLE_FEATURE_CP_REFLINK |
| 117 | BUILD_BUG_ON(OPT_reflink != FILEUTILS_REFLINK); | 117 | BUILD_BUG_ON((int)OPT_reflink != (int)FILEUTILS_REFLINK); |
| 118 | if (flags & FILEUTILS_REFLINK) { | 118 | if (flags & FILEUTILS_REFLINK) { |
| 119 | if (!reflink) | 119 | if (!reflink) |
| 120 | flags |= FILEUTILS_REFLINK_ALWAYS; | 120 | flags |= FILEUTILS_REFLINK_ALWAYS; |