[Libreoffice-commits] .: vcl/win

[Tor Lillqvist]

 vcl/win/source/app/salinst.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit c3d2ee777147d58edd06dcb7b246c780d843bd03
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Oct 27 18:59:58 2010 +0300

    Fix mutex related compilation errors

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 739ce0d..01c0b37 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -54,6 +54,7 @@
 #include <vcl/timer.hxx>
 #include <wincomp.hxx>	// CS_DROPSHADOW
 #include <tools/solarmutex.hxx>
+#include <vcl/solarmutex.hxx>
 
 #ifndef min
 #define min(a,b)	(((a) < (b)) ? (a) : (b))
@@ -134,7 +135,7 @@ SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData )
 
 void SAL_CALL SalYieldMutex::acquire()
 {
-    OMutex::acquire();
+    SolarMutexObject::acquire();
     mnCount++;
     mnThreadId = GetCurrentThreadId();
 }
@@ -145,7 +146,7 @@ void SAL_CALL SalYieldMutex::release()
 {
     DWORD nThreadId = GetCurrentThreadId();
     if ( mnThreadId != nThreadId )
-        OMutex::release();
+        SolarMutexObject::release();
     else
     {
         SalData* pSalData = GetSalData();
@@ -162,13 +163,13 @@ void SAL_CALL SalYieldMutex::release()
                     ImplPostMessage( mpInstData->mhComWnd, SAL_MSG_RELEASEWAITYIELD, 0, 0 );
                 mnThreadId = 0;
                 mnCount--;
-                OMutex::release();
+                SolarMutexObject::release();
                 mpInstData->mpSalWaitMutex->release();
             }
             else
             {
                 mnCount--;
-                OMutex::release();
+                SolarMutexObject::release();
             }
         }
         else
@@ -176,7 +177,7 @@ void SAL_CALL SalYieldMutex::release()
             if ( mnCount == 1 )
                 mnThreadId = 0;
             mnCount--;
-            OMutex::release();
+            SolarMutexObject::release();
         }
     }
 }
@@ -185,7 +186,7 @@ void SAL_CALL SalYieldMutex::release()
 
 sal_Bool SAL_CALL SalYieldMutex::tryToAcquire()
 {
-    if( OMutex::tryToAcquire() )
+    if( SolarMutexObject::tryToAcquire() )
     {
         mnCount++;
         mnThreadId = GetCurrentThreadId();