From 28c50c16cdeda7de39ed15c17094f3de01287d4c Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 23 Feb 2013 12:30:13 -0500 Subject: [PATCH] Fix build on Windows --- src/debug.h | 3 +++ src/jthread/jmutex.h | 5 ++++- src/porting.h | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/debug.h b/src/debug.h index 69a215a4..56952427 100644 --- a/src/debug.h +++ b/src/debug.h @@ -32,6 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN + #ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0500 + #endif #include #ifdef _MSC_VER #include diff --git a/src/jthread/jmutex.h b/src/jthread/jmutex.h index 6675162a..e528aeb4 100644 --- a/src/jthread/jmutex.h +++ b/src/jthread/jmutex.h @@ -30,6 +30,9 @@ #define JMUTEX_H #if (defined(WIN32) || defined(_WIN32_WCE)) + #ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0500 + #endif #ifndef _WIN32_WCE #include #endif // _WIN32_WCE @@ -88,7 +91,7 @@ public: void signal() { SetEvent(hEvent); } -} +}; #else diff --git a/src/porting.h b/src/porting.h index 03d2fcbd..d7d10734 100644 --- a/src/porting.h +++ b/src/porting.h @@ -40,14 +40,17 @@ with this program; if not, write to the Free Software Foundation, Inc., //#define ALIGNOF(type) offsetof (alignment_trick, member) #ifdef _WIN32 + #ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0500 + #endif #include #define sleep_ms(x) Sleep(x) #else #include #include //for uintptr_t - - #if defined(linux) || defined(__linux) + + #if (defined(linux) || defined(__linux)) && !defined(_GNU_SOURCE) #define _GNU_SOURCE #endif