diff options
| author | kwolekr <mirrorisim@gmail.com> | 2013-01-29 13:07:47 -0800 |
|---|---|---|
| committer | kwolekr <mirrorisim@gmail.com> | 2013-01-29 13:07:47 -0800 |
| commit | 12472a44d4ce1a35cad0b9ebe53550a7d44134d5 (patch) | |
| tree | 359cf19d5eb059aa6236256e6a6b3fe8b4ea5da4 /src/porting.h | |
| parent | cbbb6447bfd3a6d0013b3605aeca840733d87561 (diff) | |
| parent | 9d69b3858385e657a3d1a8b64d302c0bd5a23166 (diff) | |
| download | minetest-12472a44d4ce1a35cad0b9ebe53550a7d44134d5.tar.gz minetest-12472a44d4ce1a35cad0b9ebe53550a7d44134d5.tar.bz2 minetest-12472a44d4ce1a35cad0b9ebe53550a7d44134d5.zip | |
Merge pull request #442 from kwolekr/mingw_compile_fix
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)) |