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

Last-Update: 2018-12-28

Gbp-Pq: Name m68k-fix-parameter-type.patch

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index ac3b23567897a65e2eb749b5327430aff8e6b8b7..30a6cef6f3c51d1f2af91ab303a181b79268d40c 100644 (file)
--- 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