folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MINGW: Reorder windows include files to avoid future complications

Browse source
This commit is contained in:
Mark Pizzolato 2018-02-12 20:48:39 -08:00
parent 2b9ce757fd
commit ce8aea13bc
5 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontpanel/FrontPanelTest.c
View file

@ -41,6 +41,7 @@
#if defined(_WIN32) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#include <winerror.h>
#define usleep(n) Sleep(n/1000) #define usleep(n) Sleep(n/1000)
#else #else
#include <unistd.h> #include <unistd.h>

1
sim_console.c
View file

@ -3285,7 +3285,6 @@ return SCPE_OK;
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>
#include <windows.h>
#define RAW_MODE 0 #define RAW_MODE 0
static HANDLE std_input; static HANDLE std_input;
static HANDLE std_output; static HANDLE std_output;

1
sim_defs.h
View file

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

3
sim_disk.c
View file

@ -80,9 +80,6 @@ Internal routines:
#include <ctype.h> #include <ctype.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef _WIN32
#include <windows.h>
#endif
#if defined SIM_ASYNCH_IO #if defined SIM_ASYNCH_IO
#include <pthread.h> #include <pthread.h>
#endif #endif

1
sim_frontpanel.c
View file

@ -63,6 +63,7 @@ extern "C" {
#if defined(_WIN32) #if defined(_WIN32)
#include <process.h> #include <process.h>
#include <windows.h> #include <windows.h>
#include <winerror.h>
#define sleep(n) Sleep(n*1000) #define sleep(n) Sleep(n*1000)
#define msleep(n) Sleep(n) #define msleep(n) Sleep(n)
#define strtoull _strtoui64 #define strtoull _strtoui64