hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2015-08-28 22:17:35 +02:00
commit 27fdbb2468
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/shared_memory.cpp
View file

@ -187,7 +187,7 @@ namespace IPC {
#if defined(__CYGWIN__) || defined(_WIN32)
result = WaitForSingleObject(mySem, 0);//wait at most 1ms
if (result == 0x80){
WARN_MSG("Consistency error caught on semaphore %s", myName);
WARN_MSG("Consistency error caught on semaphore %s", myName.c_str());
result = 0;
}
#else
@ -202,7 +202,7 @@ namespace IPC {
#if defined(__CYGWIN__) || defined(_WIN32)
result = WaitForSingleObject(mySem, 1000);//wait at most 1s
if (result == 0x80){
WARN_MSG("Consistency error caught on semaphore %s", myName);
WARN_MSG("Consistency error caught on semaphore %s", myName.c_str());
result = 0;
}
#else