diff options
| author | kwolekr <mirrorisim@gmail.com> | 2013-01-23 02:21:26 -0500 |
|---|---|---|
| committer | kwolekr <mirrorisim@gmail.com> | 2013-01-23 16:28:15 -0500 |
| commit | 69ba4854152415ab3e2ec11cdb6f9c9ce5af9ac8 (patch) | |
| tree | c52f6fc20df7c46c3f74ed8610399e6ed82d0822 /src/porting.h | |
| parent | 035933f806d3afc45e2e558e505318489209a70b (diff) | |
| download | minetest-69ba4854152415ab3e2ec11cdb6f9c9ce5af9ac8.tar.gz minetest-69ba4854152415ab3e2ec11cdb6f9c9ce5af9ac8.tar.bz2 minetest-69ba4854152415ab3e2ec11cdb6f9c9ce5af9ac8.zip | |
Fix compile under MingW
Diffstat (limited to 'src/porting.h')
| -rw-r--r-- | src/porting.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/porting.h b/src/porting.h index 184e1ab54..c8d19154c 100644 --- a/src/porting.h +++ b/src/porting.h @@ -42,18 +42,26 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifdef _WIN32 #include <windows.h> - #define ALIGNOF(x) __alignof(x) #define sleep_ms(x) Sleep(x) +#else + #include <unistd.h> + #include <stdint.h> //for uintptr_t + + #define sleep_ms(x) usleep(x*1000) +#endif + +#ifdef _MSC_VER + #define ALIGNOF(x) __alignof(x) #define strtok_r(x, y, z) strtok_s(x, y, z) #define strtof(x, y) (float)strtod(x, y) #define strtoll(x, y, z) _strtoi64(x, y, z) #define strtoull(x, y, z) _strtoui64(x, y, z) #else - #include <unistd.h> - #include <stdint.h> //for uintptr_t - #define ALIGNOF(x) __alignof__(x) - #define sleep_ms(x) usleep(x*1000) +#endif + +#ifdef __MINGW32__ + #define strtok_r(x, y, z) mystrtok_r(x, y, z) #endif #define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1)) |