* lily/kpath.cc:

* lily/lily-guile.cc: macosx fixes.

diff --git a/ChangeLog b/ChangeLog
index 6154559725cadeb98c95aa6fabaa9356bdf1a0eb..4240f2c71d2ad6d6358046e22f2f2183e8153ea7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
        corrections. Thanks to Karl Berry
 
 2000-08-30  Heikki Junes <hjunes@cc.hut.fi>
+       
         * make/lilypond.mandrake.spec.in: Mandrake adaptations from
         redhat spec and rpm-skeleton found in Mandrake's home page.
 

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 9748f6e6a60dd7cc3539f24e7c65a8f568720ac7..7bf5e61783fef81cda6e9630c9e73f8683a5e932 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -13,6 +13,20 @@
 #include <stdlib.h>
 #include <math.h>   /* isinf */
 #include <string.h> /* strdup, strchr */
+
+
+#include "lily-proto.hh"
+
+/* macosx fix:
+
+
+ source-file.hh includes cmath which undefines isinf and isnan
+*/
+inline int my_isinf(Real r) { return isinf(r); }
+inline int my_isnan(Real r) { return isnan(r); }
+
+
+
 #include "libc-extension.hh"
 #include "lily-guile.hh"
 #include "main.hh"
@@ -23,14 +37,6 @@
 #include "interval.hh"
 #include "pitch.hh"
 #include "dimensions.hh"
-
-/* macosx fix:
-
- source-file.hh includes cmath which undefines isinf and isnan
-*/
-inline int (isinf)(Real r) { return isinf(r); }
-inline int (isnan)(Real r) { return isnan(r); }
-
 #include "source-file.hh"
 
 // #define TEST_GC
@@ -320,7 +326,7 @@ leaves a space at the end.
     {
       Real r (gh_scm2double (s));
 
-      if (isinf (r) || isnan (r))
+      if (my_isinf (r) || my_isnan (r))
        {
          programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
          r = 0.0;