diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-09-02 08:44:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-09-02 08:44:38 +0300 |
| commit | 893c6785a97d8a6cbc4beab12637fee76534787c (patch) | |
| tree | b669e15e05d05b9d16115d87257e3b5b5689c743 /sal | |
| parent | 581e7d7057afa87036d84e42c0e0a8a7368e20c7 (diff) | |
Fix MinGW compilation error with min()
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/security/osl_Security.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index afd441bfbc2b..ca7bdb318d28 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)); |