From: Graham Percival <graham@percival-music.ca>
Date: Thu, 9 Dec 2004 20:21:21 +0000 (+0000)
Subject: Minor change to compile on OSX.
X-Git-Tag: release/2.5.14~464
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=39c4ae7b06fd2b72655f631eb81ee24ad21c21b8;p=lilypond.git

Minor change to compile on OSX.
---

diff --git a/ChangeLog b/ChangeLog
index ec133dfaf2..73e260eb76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-09  Christian hitz  <chhitz@gmx.net>
+
+	* lily/lily-guile.cc: change MACOS_X to __APPLE__
+
 2004-12-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/include/type-swallow-translator.hh
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 936d12d460..ad54d7f664 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -22,7 +22,7 @@
 /* MacOS S fix:
    source-file.hh includes cmath which undefines isinf and isnan
 */
-#ifdef MACOS_X
+#ifdef __APPLE__
 inline int my_isinf (Real r) { return isinf (r); }
 inline int my_isnan (Real r) { return isnan (r); }
 #endif
@@ -386,7 +386,7 @@ LY_DEFINE (ly_number2string, "ly:number->string",
   if (scm_exact_p (s) == SCM_BOOL_F)
     {
       Real r (scm_to_double (s));
-#ifdef MACOS_X
+#ifdef __APPLE__
       if (my_isinf (r) || my_isnan (r))
 #else
       if (isinf (r) || isnan (r))