diff options
author | Ron Yorston <rmy@pobox.com> | 2021-10-13 14:37:51 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-10-13 14:37:51 +0100 |
commit | 0ecf1aea459571b48dc68ddc2b7b9265740fa960 (patch) | |
tree | 491d6184a44b8b525a4ca35759d622aecd7f6344 /miscutils | |
parent | 4859ddcb20616718efbea12c6bf8b27c469b68de (diff) | |
parent | aaf3d5ba74c5da97ff80b61f30cb8dd225d39096 (diff) | |
download | busybox-w32-0ecf1aea459571b48dc68ddc2b7b9265740fa960.tar.gz busybox-w32-0ecf1aea459571b48dc68ddc2b7b9265740fa960.tar.bz2 busybox-w32-0ecf1aea459571b48dc68ddc2b7b9265740fa960.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/bc.c | 2 | ||||
-rw-r--r-- | miscutils/less.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c index f931be5cc..e3f7573c9 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c | |||
@@ -2261,7 +2261,7 @@ static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size | |||
2261 | } | 2261 | } |
2262 | #define zbc_num_p(...) (zbc_num_p(__VA_ARGS__) COMMA_SUCCESS) | 2262 | #define zbc_num_p(...) (zbc_num_p(__VA_ARGS__) COMMA_SUCCESS) |
2263 | 2263 | ||
2264 | static BC_STATUS zbc_num_sqrt(BcNum *a, BcNum *restrict b, size_t scale) | 2264 | static NOINLINE BC_STATUS zbc_num_sqrt(BcNum *a, BcNum *restrict b, size_t scale) |
2265 | { | 2265 | { |
2266 | BcStatus s; | 2266 | BcStatus s; |
2267 | BcNum num1, num2, half, f, fprime, *x0, *x1, *temp; | 2267 | BcNum num1, num2, half, f, fprime, *x0, *x1, *temp; |
diff --git a/miscutils/less.c b/miscutils/less.c index a5ce14c91..063c4d378 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -1904,7 +1904,7 @@ int less_main(int argc, char **argv) | |||
1904 | getopt32(argv, "EMmN~IF" | 1904 | getopt32(argv, "EMmN~IF" |
1905 | IF_FEATURE_LESS_TRUNCATE("S") | 1905 | IF_FEATURE_LESS_TRUNCATE("S") |
1906 | IF_FEATURE_LESS_RAW("R") | 1906 | IF_FEATURE_LESS_RAW("R") |
1907 | /*ignored:*/"s" | 1907 | /*ignored:*/"sX" |
1908 | ); | 1908 | ); |
1909 | argv += optind; | 1909 | argv += optind; |
1910 | num_files = argc - optind; | 1910 | num_files = argc - optind; |