mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typelib: Fix incorrect parameter type to std::min() on m68k

Browse Source 
Change-Id: Id674d19d38ebe634707f5a480e596efe8c83cc6a
Reviewed-on: https://gerrit.libreoffice.org/65684
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
John Paul Adrian Glaubitz
2018-12-28 12:13:24 +01:00
committed by Noel Grandin
parent 2086b78105
commit 5bdffc57b1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppu/source/typelib/typelib.cxx
View File

@@ -1663,7 +1663,7 @@ extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize(
#ifdef __m68k__
// Anything that is at least 16 bits wide is aligned on a 16-bit
// boundary on the m68k default abi
sal_Int32 nMaxAlign = std::min(rMaxIntegralTypeSize, 2);
sal_Int32 nMaxAlign = std::min(rMaxIntegralTypeSize, sal_Int32( 2 ));
nStructSize = (nStructSize + nMaxAlign -1) / nMaxAlign * nMaxAlign;
#else
// Example: A { double; int; } structure has a size of 16 instead of 10. The