0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename WAIT_TIMEOUT in thread.[ch]pp's WAIT_TIMEOUT_RESULT...

Browse source 
...enum to WAIT_TIMED_OUT due to a possible conflict with a Windows
header macro.

On mingw with gcc 4.3.3, boost >= 1.41 pulls a Mingw Windows header
which pulls another Mingw Windows (...) and finally includes
<winerror.h> which #defines WAIT_TIMEOUT as a number.
This commit is contained in:
Tomasz Śniatowski 2010-03-26 01:13:09 +01:00
parent 1b50bc4e33
commit 9da4e6dc9d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/thread.cpp
View file

@ -115,7 +115,7 @@ condition::WAIT_TIMEOUT_RESULT condition::wait_timeout(const mutex& m, unsigned
const int res = SDL_CondWaitTimeout(cond_,m.m_,timeout);
switch(res) {
case 0: return WAIT_OK;
case SDL_MUTEX_TIMEDOUT: return WAIT_TIMEOUT;
case SDL_MUTEX_TIMEDOUT: return WAIT_TIMED_OUT;
default:
ERR_G << "SDL_CondWaitTimeout: " << SDL_GetError() << "\n";
return WAIT_ERROR;

2
src/thread.hpp
View file

@ -156,7 +156,7 @@ public:
//
bool wait(const mutex& m);
enum WAIT_TIMEOUT_RESULT { WAIT_OK, WAIT_TIMEOUT, WAIT_ERROR };
enum WAIT_TIMEOUT_RESULT { WAIT_OK, WAIT_TIMED_OUT, WAIT_ERROR };
// wait on the condition with a timeout. Basically the same as the
// wait() function, but if the lock is not aquired before the