[Libreoffice-commits] core.git: vcl/win

Stephan Bergmann sbergman at redhat.com
Tue Sep 19 09:11:02 UTC 2017


 vcl/win/app/salinst.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adbf7da7d1d9a1701c3fccbfbbf9d749d6478e6c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 19 11:08:38 2017 +0200

    Inconsistent declarations of ImplSalYieldMutexAcquireWithWait
    
    ...introduced with 3840aede596e6fc24f7ed7df9100fb028134aac6 "Unify SolarMutex
    implementations" (causing link failure and clang-cl loplugin:unreffun with
    64 bit Windows builds)
    
    Change-Id: I273d15e74ad88648ebbccb33f1348497779cc488

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 2f4e0b669689..539a7d2c3eef 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -175,7 +175,7 @@ sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll )
     return nCount;
 }
 
-void ImplSalYieldMutexAcquireWithWait( sal_uLong nCount )
+void ImplSalYieldMutexAcquireWithWait( sal_uInt32 nCount )
 {
     WinSalInstance* pInst = GetSalData()->mpFirstInstance;
     if ( pInst )


More information about the Libreoffice-commits mailing list