diff -r 043a787c3cee -r f70f688d9ef9 lemon/bits/windows.cc --- a/lemon/bits/windows.cc Thu Apr 02 14:07:38 2015 +0200 +++ b/lemon/bits/windows.cc Tue Apr 28 18:07:07 2015 +0200 @@ -21,7 +21,7 @@ #include -#ifdef WIN32 +#ifdef LEMON_WIN32 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif @@ -40,7 +40,7 @@ #else #include #include -#ifndef WIN32 +#ifndef LEMON_WIN32 #include #endif #include @@ -55,7 +55,7 @@ double &utime, double &stime, double &cutime, double &cstime) { -#ifdef WIN32 +#ifdef LEMON_WIN32 static const double ch = 4294967296.0e-7; static const double cl = 1.0e-7; @@ -94,11 +94,11 @@ std::string getWinFormattedDate() { std::ostringstream os; -#ifdef WIN32 +#ifdef LEMON_WIN32 SYSTEMTIME time; GetSystemTime(&time); char buf1[11], buf2[9], buf3[5]; - if (GetDateFormat(MY_LOCALE, 0, &time, + if (GetDateFormat(MY_LOCALE, 0, &time, ("ddd MMM dd"), buf1, 11) && GetTimeFormat(MY_LOCALE, 0, &time, ("HH':'mm':'ss"), buf2, 9) && @@ -120,7 +120,7 @@ int getWinRndSeed() { -#ifdef WIN32 +#ifdef LEMON_WIN32 FILETIME time; GetSystemTimeAsFileTime(&time); return GetCurrentProcessId() + time.dwHighDateTime + time.dwLowDateTime; @@ -132,7 +132,7 @@ } WinLock::WinLock() { -#ifdef WIN32 +#ifdef LEMON_WIN32 CRITICAL_SECTION *lock = new CRITICAL_SECTION; InitializeCriticalSection(lock); _repr = lock; @@ -142,7 +142,7 @@ } WinLock::~WinLock() { -#ifdef WIN32 +#ifdef LEMON_WIN32 CRITICAL_SECTION *lock = static_cast(_repr); DeleteCriticalSection(lock); delete lock; @@ -150,14 +150,14 @@ } void WinLock::lock() { -#ifdef WIN32 +#ifdef LEMON_WIN32 CRITICAL_SECTION *lock = static_cast(_repr); EnterCriticalSection(lock); #endif } void WinLock::unlock() { -#ifdef WIN32 +#ifdef LEMON_WIN32 CRITICAL_SECTION *lock = static_cast(_repr); LeaveCriticalSection(lock); #endif