sal/osl/unx/security.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b89c5c111b1fafdb2b0e4fd1d8bad0a864a670bc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Mon Jan 15 08:59:49 2018 +0200
fix android build
Change-Id: Id53f9d2a5adf126db9abeab620bb92b8720425f7
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index bdd9db6b7b94..9b76060f40a2 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -263,7 +263,7 @@ static bool osl_psz_getHomeDir(oslSecurity Security,
sal_Char* pszDirectory, sal
OUSTRING_TO_OSTRING_CVTFLAGS);
if (pStrValue && pStrValue->length > 0)
{
- sal_Int32 nCopy = (sal_Int32)std::min(nMax-1,
pStrValue->length) ;
+ sal_Int32 nCopy = (sal_Int32)std::min<sal_uInt32>(nMax-1,
pStrValue->length) ;
strncpy (pszDirectory, pStrValue->buffer, nCopy);
pszDirectory[nCopy] = '\0';
bRet = (std::size_t)pStrValue->length < nMax;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
