MINGW: Fix build with newest MinGW tool chain

Newest Win32 include files changed the include file order as compared to the
Microsoft MS compilers.

This is arguably a bug in the MinGW codebase, but working around it is too trivial
to complain about.
This commit is contained in:
Mark Pizzolato 2018-02-08 19:07:17 -08:00
parent 6ca71c76d9
commit 2b9ce757fd
3 changed files with 3 additions and 0 deletions

View file

@ -127,6 +127,7 @@ extern int sim_vax_snprintf(char *buf, size_t buf_size, const char *fmt, ...);
#ifdef _WIN32
#include <winsock2.h>
#include <winerror.h>
#undef PACKED /* avoid macro name collision */
#undef ERROR /* avoid macro name collision */
#undef MEM_MAPPED /* avoid macro name collision */

View file

@ -52,6 +52,7 @@ extern "C" {
#if defined (_WIN32) /* Windows */
#include <winsock2.h>
#include <winerror.h>
#elif !defined (__OS2__) || defined (__EMX__) /* VMS, Mac, Unix, OS/2 EMX */
#include <sys/types.h> /* for fcntl, getpid */

View file

@ -12,6 +12,7 @@
typedef char *caddr_t;
# include <windows.h>
# include <winerror.h>
# include <winsock2.h>
# include <ws2tcpip.h>
# include <sys/timeb.h>