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 /win32/poll.c | |
| 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 'win32/poll.c')
| -rw-r--r-- | win32/poll.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/win32/poll.c b/win32/poll.c index 3294fdc96..8f16d93e9 100644 --- a/win32/poll.c +++ b/win32/poll.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | # pragma GCC diagnostic ignored "-Wtype-limits" | 23 | # pragma GCC diagnostic ignored "-Wtype-limits" |
| 24 | #endif | 24 | #endif |
| 25 | 25 | ||
| 26 | #include "libbb.h" | ||
| 26 | #include <malloc.h> | 27 | #include <malloc.h> |
| 27 | 28 | ||
| 28 | #include <sys/types.h> | 29 | #include <sys/types.h> |
| @@ -37,9 +38,6 @@ | |||
| 37 | #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ | 38 | #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ |
| 38 | # define WINDOWS_NATIVE | 39 | # define WINDOWS_NATIVE |
| 39 | # define WIN32_NATIVE | 40 | # define WIN32_NATIVE |
| 40 | # if defined (_MSC_VER) | ||
| 41 | # define _WIN32_WINNT 0x0502 | ||
| 42 | # endif | ||
| 43 | # include <winsock2.h> | 41 | # include <winsock2.h> |
| 44 | # include <windows.h> | 42 | # include <windows.h> |
| 45 | # include <io.h> | 43 | # include <io.h> |