diff options
author | Ron Yorston <rmy@pobox.com> | 2021-02-13 10:54:34 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-02-13 10:54:34 +0000 |
commit | 3e460d91bd365b58860112fa1b517604f19ebbdf (patch) | |
tree | fd08aac2e17f9c586d579592c1e1d760380146b8 | |
parent | 8489ebce32f4b6cf5c1c1120fd474e26f7659db7 (diff) | |
download | busybox-w32-3e460d91bd365b58860112fa1b517604f19ebbdf.tar.gz busybox-w32-3e460d91bd365b58860112fa1b517604f19ebbdf.tar.bz2 busybox-w32-3e460d91bd365b58860112fa1b517604f19ebbdf.zip |
bc: fix to build on WIN32 and enable in default configurations
-rw-r--r-- | configs/mingw32_defconfig | 12 | ||||
-rw-r--r-- | configs/mingw64_defconfig | 12 | ||||
-rw-r--r-- | miscutils/bc.c | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 4edf90df3..772f7fdb9 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Busybox version: 1.34.0.git | 3 | # Busybox version: 1.34.0.git |
4 | # Sun Feb 7 13:53:22 2021 | 4 | # Sat Feb 13 10:29:16 2021 |
5 | # | 5 | # |
6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
7 | # CONFIG_PLATFORM_POSIX is not set | 7 | # CONFIG_PLATFORM_POSIX is not set |
@@ -753,12 +753,12 @@ CONFIG_REV=y | |||
753 | # CONFIG_ADJTIMEX is not set | 753 | # CONFIG_ADJTIMEX is not set |
754 | # CONFIG_BBCONFIG is not set | 754 | # CONFIG_BBCONFIG is not set |
755 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set | 755 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set |
756 | # CONFIG_BC is not set | 756 | CONFIG_BC=y |
757 | CONFIG_DC=y | 757 | CONFIG_DC=y |
758 | # CONFIG_FEATURE_DC_BIG is not set | 758 | CONFIG_FEATURE_DC_BIG=y |
759 | CONFIG_FEATURE_DC_LIBM=y | 759 | # CONFIG_FEATURE_DC_LIBM is not set |
760 | # CONFIG_FEATURE_BC_INTERACTIVE is not set | 760 | CONFIG_FEATURE_BC_INTERACTIVE=y |
761 | # CONFIG_FEATURE_BC_LONG_OPTIONS is not set | 761 | CONFIG_FEATURE_BC_LONG_OPTIONS=y |
762 | # CONFIG_BEEP is not set | 762 | # CONFIG_BEEP is not set |
763 | CONFIG_FEATURE_BEEP_FREQ=0 | 763 | CONFIG_FEATURE_BEEP_FREQ=0 |
764 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 | 764 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index ff73f9a51..f73f23fa3 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Busybox version: 1.34.0.git | 3 | # Busybox version: 1.34.0.git |
4 | # Sun Feb 7 13:53:22 2021 | 4 | # Sat Feb 13 10:37:01 2021 |
5 | # | 5 | # |
6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
7 | # CONFIG_PLATFORM_POSIX is not set | 7 | # CONFIG_PLATFORM_POSIX is not set |
@@ -753,12 +753,12 @@ CONFIG_REV=y | |||
753 | # CONFIG_ADJTIMEX is not set | 753 | # CONFIG_ADJTIMEX is not set |
754 | # CONFIG_BBCONFIG is not set | 754 | # CONFIG_BBCONFIG is not set |
755 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set | 755 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set |
756 | # CONFIG_BC is not set | 756 | CONFIG_BC=y |
757 | CONFIG_DC=y | 757 | CONFIG_DC=y |
758 | # CONFIG_FEATURE_DC_BIG is not set | 758 | CONFIG_FEATURE_DC_BIG=y |
759 | CONFIG_FEATURE_DC_LIBM=y | 759 | # CONFIG_FEATURE_DC_LIBM is not set |
760 | # CONFIG_FEATURE_BC_INTERACTIVE is not set | 760 | CONFIG_FEATURE_BC_INTERACTIVE=y |
761 | # CONFIG_FEATURE_BC_LONG_OPTIONS is not set | 761 | CONFIG_FEATURE_BC_LONG_OPTIONS=y |
762 | # CONFIG_BEEP is not set | 762 | # CONFIG_BEEP is not set |
763 | CONFIG_FEATURE_BEEP_FREQ=0 | 763 | CONFIG_FEATURE_BEEP_FREQ=0 |
764 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 | 764 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 |
diff --git a/miscutils/bc.c b/miscutils/bc.c index 02a61ac49..046bad98e 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c | |||
@@ -7424,7 +7424,9 @@ static int xc_vm_init(const char *env_len) | |||
7424 | // from stdin is not interrupted by ^C either, | 7424 | // from stdin is not interrupted by ^C either, |
7425 | // it restarts, thus fgetc() does not return on ^C. | 7425 | // it restarts, thus fgetc() does not return on ^C. |
7426 | // (This problem manifests only if line editing is disabled) | 7426 | // (This problem manifests only if line editing is disabled) |
7427 | # if !ENABLE_PLATFORM_MINGW32 | ||
7427 | signal_SA_RESTART_empty_mask(SIGINT, record_signo); | 7428 | signal_SA_RESTART_empty_mask(SIGINT, record_signo); |
7429 | # endif | ||
7428 | 7430 | ||
7429 | // Without SA_RESTART, this exhibits a bug: | 7431 | // Without SA_RESTART, this exhibits a bug: |
7430 | // "while (1) print 1" and try ^C-ing it. | 7432 | // "while (1) print 1" and try ^C-ing it. |