diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-02-20 13:07:14 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-02-21 09:51:08 +0000 |
| commit | 4bca7987f38b24867d93efc4a11a1ef661734056 (patch) | |
| tree | 5888b245783bf99ed4347320cce87feb5ee7cf4f /include/platform.h | |
| parent | 5369ddc1db797a96cced91bd467d172d41d41f9d (diff) | |
| download | busybox-w32-4bca7987f38b24867d93efc4a11a1ef661734056.tar.gz busybox-w32-4bca7987f38b24867d93efc4a11a1ef661734056.tar.bz2 busybox-w32-4bca7987f38b24867d93efc4a11a1ef661734056.zip | |
win32: fixes to build on Windows/MSYS2/mingw-w64
To investigate GitHub issue #200 it was necessary to perform
build on Window using the MSYS2/mingw-w64 toolchain. This
threw up some issues:
- The settings for _WIN32_WINNT and __USE_MINGW_ANSI_STDIO differ
from those in Fedora resulting in compiler errors and warnings.
Force the defaults I'm used to.
- The workaround to allow native compilation of mconf.c was broken
by a subsequent upstream change. Make it work again.
Diffstat (limited to 'include/platform.h')
| -rw-r--r-- | include/platform.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/platform.h b/include/platform.h index ea97d2682..0fc270fab 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -10,6 +10,11 @@ | |||
| 10 | #if ENABLE_PLATFORM_MINGW32 | 10 | #if ENABLE_PLATFORM_MINGW32 |
| 11 | # if !defined(__MINGW32__) /* HOSTCC is called */ | 11 | # if !defined(__MINGW32__) /* HOSTCC is called */ |
| 12 | # undef ENABLE_PLATFORM_MINGW32 | 12 | # undef ENABLE_PLATFORM_MINGW32 |
| 13 | # else | ||
| 14 | # undef __USE_MINGW_ANSI_STDIO | ||
| 15 | # define __USE_MINGW_ANSI_STDIO 0 | ||
| 16 | # undef _WIN32_WINNT | ||
| 17 | # define _WIN32_WINNT 0x502 | ||
| 13 | # endif | 18 | # endif |
| 14 | #else | 19 | #else |
| 15 | # if defined(__MINGW32__) | 20 | # if defined(__MINGW32__) |