From 92d4c925fcf24e8015aae9d3f3e3acf0645262b4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 31 Aug 2002 00:26:29 +0000 Subject: [PATCH] * lily/kpath.cc: * lily/lily-guile.cc: macosx fixes. --- ChangeLog | 1 + lily/lily-guile.cc | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6154559725..4240f2c71d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ corrections. Thanks to Karl Berry 2000-08-30 Heikki Junes + * 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 9748f6e6a6..7bf5e61783 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -13,6 +13,20 @@ #include #include /* isinf */ #include /* 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; -- 2.39.5