diff options
| author | Benoit Germain <bnt.germain@gmail.com> | 2013-11-16 10:32:46 +0100 |
|---|---|---|
| committer | Benoit Germain <bnt.germain@gmail.com> | 2013-11-16 10:32:46 +0100 |
| commit | eb82ab2e9993111bd6137db73b77d2ce41cf891a (patch) | |
| tree | e48cd7dde3a7e241c2f32497891d1a5fa8e40aee /src | |
| parent | 3f535006551e0955e2601b9614bc415c3933498a (diff) | |
| download | lanes-eb82ab2e9993111bd6137db73b77d2ce41cf891a.tar.gz lanes-eb82ab2e9993111bd6137db73b77d2ce41cf891a.tar.bz2 lanes-eb82ab2e9993111bd6137db73b77d2ce41cf891a.zip | |
Fix some compiler-specific build issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/threading.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/threading.h b/src/threading.h index 7d94f26..aed5b27 100644 --- a/src/threading.h +++ b/src/threading.h | |||
| @@ -64,7 +64,9 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED }; | |||
| 64 | #else // !PLATFORM_XBOX | 64 | #else // !PLATFORM_XBOX |
| 65 | #define WIN32_LEAN_AND_MEAN | 65 | #define WIN32_LEAN_AND_MEAN |
| 66 | // 'SignalObjectAndWait' needs this (targets Windows 2000 and above) | 66 | // 'SignalObjectAndWait' needs this (targets Windows 2000 and above) |
| 67 | #ifndef _WIN32_WINNT // already defined by TDSM-Mingw64, so avoid a warning in that case | ||
| 67 | #define _WIN32_WINNT 0x0400 | 68 | #define _WIN32_WINNT 0x0400 |
| 69 | #endif // _WIN32_WINNT | ||
| 68 | #include <windows.h> | 70 | #include <windows.h> |
| 69 | #endif // !PLATFORM_XBOX | 71 | #endif // !PLATFORM_XBOX |
| 70 | #include <process.h> | 72 | #include <process.h> |
| @@ -111,7 +113,11 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED }; | |||
| 111 | #define THREAD_CALLCONV __stdcall | 113 | #define THREAD_CALLCONV __stdcall |
| 112 | #else // THREADAPI == THREADAPI_PTHREAD | 114 | #else // THREADAPI == THREADAPI_PTHREAD |
| 113 | // PThread (Linux, OS X, ...) | 115 | // PThread (Linux, OS X, ...) |
| 114 | // | 116 | |
| 117 | // looks like some MinGW installations don't support PTW32_INCLUDE_WINDOWS_H, so let's include it ourselves, just in case | ||
| 118 | #if defined(PLATFORM_WIN32) | ||
| 119 | #include <windows.h> | ||
| 120 | #endif // PLATFORM_WIN32 | ||
| 115 | #include <pthread.h> | 121 | #include <pthread.h> |
| 116 | 122 | ||
| 117 | #ifdef PLATFORM_LINUX | 123 | #ifdef PLATFORM_LINUX |