flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixing compilation on Drawin 9 / MacOS X

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@402 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-03-12 13:31:34 +00:00
parent cb2de47247
commit b789d5ebf6
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/cEvent.cpp
View File

@@ -26,11 +26,7 @@ cEvent::cEvent(void)
m_Event = new sem_t;
if (sem_init(m_Event, 0, 0))
{
LOGWARN("WARNING cEvent: Could not create unnamed semaphore, fallback to named.");
// _X: I'm unconvinced about using sem_unlink() just after a successful sem_open(), it seems wrong - why destroy the object just after creating?
ASSERT(!"This codepath is really weird, if it is ever used, please check that everything works.");
// This path is used by MacOS, because it doesn't support unnamed semaphores.
delete m_Event;
m_bIsNamed = true;
@@ -42,13 +38,6 @@ cEvent::cEvent(void)
LOGERROR("cEvent: Cannot create event, errno = %i. Aborting server.", errno);
abort();
}
else
{
if( sem_unlink(EventName.c_str()) != 0 )
{
LOGWARN("ERROR: Could not unlink cEvent. (%i)", errno);
}
}
}
#endif // *nix
}
@@ -64,6 +53,10 @@ cEvent::~cEvent()
#else
if (m_bIsNamed)
{
if (sem_unlink(EventName.c_str()) != 0)
{
LOGWARN("ERROR: Could not unlink cEvent. (%i)", errno);
}
if (sem_close(m_Event) != 0)
{
LOGERROR("ERROR: Could not close cEvent. (%i)", errno);