From 491160247a435170b72d7c5bbb5f1198a3b2a17d Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 4 May 2005 11:03:11 +0000
Subject: [PATCH] *** empty log message ***

---
 flower/include/real.hh | 1 +
 lily/note-head.cc      | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/flower/include/real.hh b/flower/include/real.hh
index d8daa64433..8a62bbceb9 100644
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -9,6 +9,7 @@
 #ifndef REAL_HH
 #define REAL_HH
 
+#include <algorithm>
 #include <climits>
 
 typedef double Real;
diff --git a/lily/note-head.cc b/lily/note-head.cc
index 6096c7cd00..c3844dae6b 100644
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -10,6 +10,9 @@
 
 #include <math.h>
 #include <cctype>
+#include <algorithm> 		//  min, max
+
+using namespace std; 
 
 #include "directional-element-interface.hh"
 #include "staff-symbol.hh"
@@ -162,7 +165,7 @@ int
 Note_head::get_balltype (Grob *me)
 {
   SCM s = me->get_property ("duration-log");
-  return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
+  return scm_is_number (s) ? min ((int) scm_to_int (s), (int) 2) : 0;
 }
 
 ADD_INTERFACE (Note_head, "note-head-interface",
-- 
2.39.2