diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-01-10 09:05:01 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-01-10 09:05:01 +0000 |
| commit | 5757aff16d8ca7570386a3eda4d1d5196d820bbb (patch) | |
| tree | 110343caf4d8c28f6c972b039741f010939d14e9 | |
| parent | f99a280743e877c14ee90a3f9e93a34ca3476a27 (diff) | |
| download | busybox-w32-5757aff16d8ca7570386a3eda4d1d5196d820bbb.tar.gz busybox-w32-5757aff16d8ca7570386a3eda4d1d5196d820bbb.tar.bz2 busybox-w32-5757aff16d8ca7570386a3eda4d1d5196d820bbb.zip | |
Update default configuration; compilation fix
Continue to use old version of dc; add definition of LONG_BIT from
xopen_lim.h.
| -rw-r--r-- | configs/mingw32_defconfig | 13 | ||||
| -rw-r--r-- | configs/mingw64_defconfig | 13 | ||||
| -rw-r--r-- | include/mingw.h | 16 |
3 files changed, 34 insertions, 8 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 0b8cf83ce..8f847cdb3 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.30.0.git | 3 | # Busybox version: 1.31.0.git |
| 4 | # Wed Nov 28 10:24:41 2018 | 4 | # Thu Jan 10 08:56:53 2019 |
| 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 |
| @@ -739,6 +739,12 @@ CONFIG_REV=y | |||
| 739 | # CONFIG_ADJTIMEX is not set | 739 | # CONFIG_ADJTIMEX is not set |
| 740 | # CONFIG_BBCONFIG is not set | 740 | # CONFIG_BBCONFIG is not set |
| 741 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set | 741 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set |
| 742 | # CONFIG_BC is not set | ||
| 743 | CONFIG_DC=y | ||
| 744 | # CONFIG_FEATURE_DC_BIG is not set | ||
| 745 | CONFIG_FEATURE_DC_LIBM=y | ||
| 746 | # CONFIG_FEATURE_BC_INTERACTIVE is not set | ||
| 747 | # CONFIG_FEATURE_BC_LONG_OPTIONS is not set | ||
| 742 | # CONFIG_BEEP is not set | 748 | # CONFIG_BEEP is not set |
| 743 | CONFIG_FEATURE_BEEP_FREQ=0 | 749 | CONFIG_FEATURE_BEEP_FREQ=0 |
| 744 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 | 750 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 |
| @@ -757,8 +763,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 | |||
| 757 | # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set | 763 | # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set |
| 758 | CONFIG_FEATURE_CROND_DIR="" | 764 | CONFIG_FEATURE_CROND_DIR="" |
| 759 | # CONFIG_CRONTAB is not set | 765 | # CONFIG_CRONTAB is not set |
| 760 | CONFIG_DC=y | ||
| 761 | CONFIG_FEATURE_DC_LIBM=y | ||
| 762 | # CONFIG_DEVFSD is not set | 766 | # CONFIG_DEVFSD is not set |
| 763 | # CONFIG_DEVFSD_MODLOAD is not set | 767 | # CONFIG_DEVFSD_MODLOAD is not set |
| 764 | # CONFIG_DEVFSD_FG_NP is not set | 768 | # CONFIG_DEVFSD_FG_NP is not set |
| @@ -834,6 +838,7 @@ CONFIG_FEATURE_IPV6=y | |||
| 834 | # CONFIG_FEATURE_UNIX_LOCAL is not set | 838 | # CONFIG_FEATURE_UNIX_LOCAL is not set |
| 835 | CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y | 839 | CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y |
| 836 | # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set | 840 | # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set |
| 841 | # CONFIG_FEATURE_TLS_SHA1 is not set | ||
| 837 | # CONFIG_ARP is not set | 842 | # CONFIG_ARP is not set |
| 838 | # CONFIG_ARPING is not set | 843 | # CONFIG_ARPING is not set |
| 839 | # CONFIG_BRCTL is not set | 844 | # CONFIG_BRCTL is not set |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index 46ebfbbfc..0eb9bd166 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.30.0.git | 3 | # Busybox version: 1.31.0.git |
| 4 | # Wed Nov 28 10:26:29 2018 | 4 | # Thu Jan 10 08:56:53 2019 |
| 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 |
| @@ -739,6 +739,12 @@ CONFIG_REV=y | |||
| 739 | # CONFIG_ADJTIMEX is not set | 739 | # CONFIG_ADJTIMEX is not set |
| 740 | # CONFIG_BBCONFIG is not set | 740 | # CONFIG_BBCONFIG is not set |
| 741 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set | 741 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set |
| 742 | # CONFIG_BC is not set | ||
| 743 | CONFIG_DC=y | ||
| 744 | # CONFIG_FEATURE_DC_BIG is not set | ||
| 745 | CONFIG_FEATURE_DC_LIBM=y | ||
| 746 | # CONFIG_FEATURE_BC_INTERACTIVE is not set | ||
| 747 | # CONFIG_FEATURE_BC_LONG_OPTIONS is not set | ||
| 742 | # CONFIG_BEEP is not set | 748 | # CONFIG_BEEP is not set |
| 743 | CONFIG_FEATURE_BEEP_FREQ=0 | 749 | CONFIG_FEATURE_BEEP_FREQ=0 |
| 744 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 | 750 | CONFIG_FEATURE_BEEP_LENGTH_MS=0 |
| @@ -757,8 +763,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 | |||
| 757 | # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set | 763 | # CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set |
| 758 | CONFIG_FEATURE_CROND_DIR="" | 764 | CONFIG_FEATURE_CROND_DIR="" |
| 759 | # CONFIG_CRONTAB is not set | 765 | # CONFIG_CRONTAB is not set |
| 760 | CONFIG_DC=y | ||
| 761 | CONFIG_FEATURE_DC_LIBM=y | ||
| 762 | # CONFIG_DEVFSD is not set | 766 | # CONFIG_DEVFSD is not set |
| 763 | # CONFIG_DEVFSD_MODLOAD is not set | 767 | # CONFIG_DEVFSD_MODLOAD is not set |
| 764 | # CONFIG_DEVFSD_FG_NP is not set | 768 | # CONFIG_DEVFSD_FG_NP is not set |
| @@ -834,6 +838,7 @@ CONFIG_FEATURE_IPV6=y | |||
| 834 | # CONFIG_FEATURE_UNIX_LOCAL is not set | 838 | # CONFIG_FEATURE_UNIX_LOCAL is not set |
| 835 | CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y | 839 | CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y |
| 836 | # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set | 840 | # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set |
| 841 | # CONFIG_FEATURE_TLS_SHA1 is not set | ||
| 837 | # CONFIG_ARP is not set | 842 | # CONFIG_ARP is not set |
| 838 | # CONFIG_ARPING is not set | 843 | # CONFIG_ARPING is not set |
| 839 | # CONFIG_BRCTL is not set | 844 | # CONFIG_BRCTL is not set |
diff --git a/include/mingw.h b/include/mingw.h index f9c098917..4077c8d44 100644 --- a/include/mingw.h +++ b/include/mingw.h | |||
| @@ -55,6 +55,22 @@ int getgrouplist(const char *user, gid_t group, gid_t *groups, int *ngroups); | |||
| 55 | #define NAME_MAX 255 | 55 | #define NAME_MAX 255 |
| 56 | #define MAXSYMLINKS 20 | 56 | #define MAXSYMLINKS 20 |
| 57 | 57 | ||
| 58 | #ifdef LONG_MAX | ||
| 59 | # if LONG_MAX == 2147483647 | ||
| 60 | # define LONG_BIT 32 | ||
| 61 | # else | ||
| 62 | /* Safe assumption. */ | ||
| 63 | # define LONG_BIT 64 | ||
| 64 | # endif | ||
| 65 | #elif defined __LONG_MAX__ | ||
| 66 | # if __LONG_MAX__ == 2147483647 | ||
| 67 | # define LONG_BIT 32 | ||
| 68 | # else | ||
| 69 | /* Safe assumption. */ | ||
| 70 | # define LONG_BIT 64 | ||
| 71 | # endif | ||
| 72 | #endif | ||
| 73 | |||
| 58 | /* | 74 | /* |
| 59 | * netdb.h | 75 | * netdb.h |
| 60 | */ | 76 | */ |