Kaydet (Commit) 5bdffc57 authored tarafından John Paul Adrian Glaubitz's avatar John Paul Adrian Glaubitz Kaydeden (comit) Noel Grandin

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

Change-Id: Id674d19d38ebe634707f5a480e596efe8c83cc6a
Reviewed-on: https://gerrit.libreoffice.org/65684
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 2086b781
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment