CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/09/26 12:05:43

Modified files:
        .              : ChangeLog 
        flower/include : interval.hh interval.tcc offset.hh real.hh 

Log message:
        * flower/include/real.hh: include <math.h> iso. <cmath>
        
        * flower/include/offset.hh: include real.hh

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4133&tr2=1.4134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/interval.hh.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/interval.tcc.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/offset.hh.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/real.hh.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4133 lilypond/ChangeLog:1.4134
--- lilypond/ChangeLog:1.4133   Tue Sep 20 11:21:01 2005
+++ lilypond/ChangeLog  Mon Sep 26 12:05:42 2005
@@ -1,3 +1,9 @@
+2005-09-26  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+       * flower/include/real.hh: include <math.h> iso. <cmath>
+
+       * flower/include/offset.hh: include real.hh
+
 2005-09-20  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
        * Documentation/user/changing-defaults.itely (Difficult tweaks):
Index: lilypond/flower/include/interval.hh
diff -u lilypond/flower/include/interval.hh:1.52 
lilypond/flower/include/interval.hh:1.53
--- lilypond/flower/include/interval.hh:1.52    Mon Aug 22 14:03:11 2005
+++ lilypond/flower/include/interval.hh Mon Sep 26 12:05:43 2005
@@ -7,6 +7,8 @@
 #ifndef INTERVAL_HH
 #define INTERVAL_HH
 
+#include <math.h>
+
 #include "flower-proto.hh"
 #include "drul-array.hh"
 
Index: lilypond/flower/include/interval.tcc
diff -u lilypond/flower/include/interval.tcc:1.42 
lilypond/flower/include/interval.tcc:1.43
--- lilypond/flower/include/interval.tcc:1.42   Mon Sep 12 12:46:48 2005
+++ lilypond/flower/include/interval.tcc        Mon Sep 26 12:05:43 2005
@@ -10,7 +10,9 @@
 #define INTERVAL_TCC
 
 #include <cassert>
-#include <cmath>
+
+// MacOS 10.3 problems:
+// #include <cmath>
 using namespace std;
 
 #include "interval.hh"
Index: lilypond/flower/include/offset.hh
diff -u lilypond/flower/include/offset.hh:1.19 
lilypond/flower/include/offset.hh:1.20
--- lilypond/flower/include/offset.hh:1.19      Sun Sep  4 11:36:35 2005
+++ lilypond/flower/include/offset.hh   Mon Sep 26 12:05:43 2005
@@ -9,6 +9,7 @@
 
 #include "axis.hh"
 #include "string.hh"
+#include "real.hh"
 
 Offset complex_multiply (Offset, Offset);
 Offset complex_divide (Offset, Offset);
Index: lilypond/flower/include/real.hh
diff -u lilypond/flower/include/real.hh:1.24 
lilypond/flower/include/real.hh:1.25
--- lilypond/flower/include/real.hh:1.24        Mon Sep 12 12:46:48 2005
+++ lilypond/flower/include/real.hh     Mon Sep 26 12:05:43 2005
@@ -11,7 +11,12 @@
 
 #include <algorithm>
 #include <climits>
-#include <cmath>
+
+/*
+  MacOS 10.3 uses g++ 3.3 which doesn't have std::isinf()
+ */
+// #include <cmath>
+#include <math.h>
 using namespace std;
 
 


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to