diff --git a/unix/modtime.c b/unix/modtime.c index c497763bf3ecadb6fe62bca7d73b8d1b3b069a96..77d2945b8f97994b3f6b3663245315502f677af2 100644 --- a/unix/modtime.c +++ b/unix/modtime.c @@ -45,9 +45,19 @@ void msec_sleep_tv(struct timeval *tv) { #define sleep_select select #endif -#if CLOCKS_PER_SEC == 1000000 // POSIX +// mingw32 defines CLOCKS_PER_SEC as ((clock_t)<somevalue>) but preprocessor does not handle casts +#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) +#define MP_REMOVE_BRACKETSA(x) +#define MP_REMOVE_BRACKETSB(x) MP_REMOVE_BRACKETSA x +#define MP_REMOVE_BRACKETSC(x) MP_REMOVE_BRACKETSB x +#define MP_CLOCKS_PER_SEC MP_REMOVE_BRACKETSC(CLOCKS_PER_SEC) +#else +#define MP_CLOCKS_PER_SEC CLOCKS_PER_SEC +#endif + +#if defined(MP_CLOCKS_PER_SEC) && (MP_CLOCKS_PER_SEC == 1000000) // POSIX #define CLOCK_DIV 1000.0 -#elif CLOCKS_PER_SEC == 1000 // WIN32 +#elif defined(MP_CLOCKS_PER_SEC) && (MP_CLOCKS_PER_SEC == 1000) // WIN32 #define CLOCK_DIV 1.0 #else #error Unsupported clock() implementation diff --git a/windows/init.c b/windows/init.c index 69f1026bb27d9d3ea09c30e50cb67c1e726ac8e9..a370c464e8fcb2562abcd51677115904420b9809 100644 --- a/windows/init.c +++ b/windows/init.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <stdio.h> -#include <Windows.h> +#include <windows.h> HANDLE hSleepEvent = NULL; diff --git a/windows/sleep.c b/windows/sleep.c index 98387350f049366186f36e2a8ce9053196907c5b..a7e5125e5bc143947bda39984327752f2dfbcfce 100644 --- a/windows/sleep.c +++ b/windows/sleep.c @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -#include <Windows.h> +#include <windows.h> extern HANDLE hSleepEvent;