djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mingw: Fix compilation issues 

- use lowercase windows.h
- fix for mingw32 using preprocessor-unfriendly definition of CLOCKS_PER_SEC
This commit is contained in:
stijn 2014-05-10 10:42:40 +02:00
parent 6e8085b425
commit f45a83d7fc
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unix/modtime.c
View File

@ -45,9 +45,19 @@ void msec_sleep_tv(struct timeval *tv) {
#define sleep_select select #define sleep_select select
#endif #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 #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 #define CLOCK_DIV 1.0
#else #else
#error Unsupported clock() implementation #error Unsupported clock() implementation

2
windows/init.c
View File

@ -26,7 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <Windows.h> #include <windows.h>
HANDLE hSleepEvent = NULL; HANDLE hSleepEvent = NULL;

2
windows/sleep.c
View File

@ -24,7 +24,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <Windows.h> #include <windows.h>
extern HANDLE hSleepEvent; extern HANDLE hSleepEvent;