firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Fixed compilation on Mac

Browse Source
This commit is contained in:
alexpeshkoff 2015-03-30 12:03:50 +00:00
parent 8b7501f136
commit 052381246c
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/isc_s_proto.h
View File

@ -36,12 +36,6 @@
// Firebird platform-specific synchronization data structures
/*
#if defined(DARWIN) || defined(ANDROID)
#define USE_FILELOCKS
#endif
*/
#if defined(DARWIN)
#define USE_FILELOCKS
#endif

15
src/common/isc_sync.cpp
View File

@ -929,15 +929,16 @@ int Sys5Semaphore::getId()
if (id < 0)
{
Arg::StatusVector status;
id = create_semaphores(status, semTable->getKey(semSet), SemTable::SEM_PER_SET);
LocalStatus ls;
CheckStatusWrapper st(&ls);
id = create_semaphores(&st, semTable->getKey(semSet), SemTable::SEM_PER_SET);
if (id >= 0)
{
idCache[semSet] = id;
}
else
{
iscLogStatus("create_semaphores failed:", status.value());
iscLogStatus("create_semaphores failed:", &st);
}
}
@ -1014,7 +1015,8 @@ void addTimer(Sys5Semaphore* sem, int microSeconds)
timerQueue->push(newTimer);
}
LocalStatus st;
LocalStatus ls;
CheckStatusWrapper st(&ls);
TimerInterfacePtr()->start(&st, newTimer, microSeconds);
check(&st);
}
@ -1040,7 +1042,8 @@ void delTimer(Sys5Semaphore* sem)
if (found)
{
LocalStatus st;
LocalStatus ls;
CheckStatusWrapper st(&ls);
TimerInterfacePtr()->stop(&st, *t);
check(&st);
}
@ -1852,7 +1855,7 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
if (!semFile->setlock(&statusVector, FileLock::FLM_SHARED))
{
if (statusVector.hasData())
statusVector.raise();
status_exception::raise(&statusVector);
else
(Arg::Gds(isc_random) << "Unknown error in setlock").raise();
}