lilypond-0.1.48

diff --git a/lib/duration-convert.cc b/lib/duration-convert.cc
index 49db74195d657882323897161c6e735421cacecb..5947216cd5d673ac6fcedd83a903258b7839d54b 100644 (file)
--- a/lib/duration-convert.cc
+++ b/lib/duration-convert.cc
@@ -114,8 +114,8 @@ Duration_convert::mom2_dur (Moment mom)
   //   Moment as_plet_mom = mom / dur.mom ();
   Moment as_plet_mom = mom / dur.length ();
   as_plet_mom *= dur.plet_.mom ();
-  long num = as_plet_mom.numerator ().as_long ();
-  long den = as_plet_mom.denominator ().as_long ();
+  long num = as_plet_mom.num ();
+  long den = as_plet_mom.den ();
   dur.set_plet (num, den);
   return dur;
 }

diff --git a/lily/main.cc b/lily/main.cc
index 6f3b7b07e40717072b92d15df5a62458cdeea883..66ae3e649caa4310bf7dfa982096ee63c1b82214 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -6,6 +6,7 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include <stdlib.h>
 #include <iostream.h>
 #include <assert.h>
 #include "proto.hh"