summaryrefslogtreecommitdiffstats
path: root/vcl/aqua
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-13 19:52:18 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-13 19:52:18 -0500
commitb28d0d0ac6918ddd638f0c8aafb250d4d97fdb70 (patch)
tree128b8726a8b6ec184f84bc09bd4f5102bca4a633 /vcl/aqua
parentno more writeInfo (diff)
downloadcore-b28d0d0ac6918ddd638f0c8aafb250d4d97fdb70.tar.gz
core-b28d0d0ac6918ddd638f0c8aafb250d4d97fdb70.zip
no more vos3
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/app/salinst.cxx3
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm2
2 files changed, 2 insertions, 3 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 6aa163059ad9..20ac4e2251d6 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -573,8 +573,7 @@ bool AquaSalInstance::CheckYieldMutex()
bool bRet = true;
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
- if ( pYieldMutex->GetThreadId() !=
- vos::OThread::getCurrentIdentifier() )
+ if ( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier())
{
bRet = false;
}
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 90e69a0331d2..a72810986c76 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -169,7 +169,7 @@ static AquaSalFrame* getMouseContainerFrame()
{
if( GetSalData() && GetSalData()->mpFirstInstance )
{
- vos::IMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
+ osl::SolarMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
if( pMutex )
{
pMutex->acquire();