From a9e6efdf3f497f071a17143f1fd8807a660c527d Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 1 Feb 2020 14:13:43 +0000 Subject: [PATCH] Fix incorrect parameter type to std::min() on m68k Last-Update: 2018-12-28 Gbp-Pq: Name m68k-fix-parameter-type.patch --- cppu/source/typelib/typelib.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index ac3b2356789..30a6cef6f3c 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -1660,7 +1660,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 -- 2.39.5