[Libreoffice-commits] .: sal/qa

[Tor Lillqvist]

 sal/qa/osl/security/osl_Security.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 893c6785a97d8a6cbc4beab12637fee76534787c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 2 08:44:38 2011 +0300

    Fix MinGW compilation error with min()

diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index afd441b..ca7bdb3 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -523,7 +523,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     psia=GetSidIdentifierAuthority(pSid);
 
     /* obtain sidsubauthority count */
-    dwSubAuthorities=min(*GetSidSubAuthorityCount(pSid), 5);
+    dwSubAuthorities=std::min((int) *GetSidSubAuthorityCount(pSid), 5);
 
     /* buffer length: S-SID_REVISION- + identifierauthority- + subauthorities- + NULL */
     Ident=(sal_Char * )malloc(88*sizeof(sal_Char));