From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 16 Jan 2013 17:02:50 +0000 (+0200)
Subject: Fix a 64-bit compilation problem
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=d5ab14158fee3fa48cb514f19d81b25bf2fe71ab;hp=e5da6bc3e1f32342e661893fbb3c1cf873422c2e;p=libs%2Fgltk.git

Fix a 64-bit compilation problem
---

diff --git a/source/text.cpp b/source/text.cpp
index 08846a4..af6b17f 100644
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -231,8 +231,8 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 	int y_offset = static_cast<int>(-font.get_descent()*font_size);
 
 	const Sides &margin = part.get_margin();
-	unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
-	first_row = min(first_row, lines.size()-n_lines);
+	unsigned n_lines = min<unsigned>(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
+	first_row = min<unsigned>(first_row, lines.size()-n_lines);
 
 	for(unsigned i=0; i<n_lines; ++i)
 	{