# HG changeset patch
# User smatz
# Date 1207339429 0
# Node ID 029fe51fff1e8d2a517969858d8ab861211dfde8
# Parent  cc5eb4f7ef4c27cd9afbfe2e001b1a1a97fa5f8a
(svn r12572) -Fix (r12192): min() has 32bit arguments, clamping of 64bit values didn't work

diff -r cc5eb4f7ef4c -r 029fe51fff1e src/core/math_func.hpp
--- a/src/core/math_func.hpp	Fri Apr 04 19:10:45 2008 +0000
+++ b/src/core/math_func.hpp	Fri Apr 04 20:03:49 2008 +0000
@@ -177,7 +177,7 @@
  */
 static inline uint16 ClampToU16(const uint64 a)
 {
-	return min(a, 0xFFFF);
+	return (uint16)(a <= 0xFFFFU ? a : 0xFFFFU);
 }
 
 /**