Minor change to compile on OSX.

diff --git a/ChangeLog b/ChangeLog
index ec133dfaf235c1830d328d0aecc771c8b357f494..73e260eb76c56a3a7db2896186569c37437d2ef4 100644 (file)
--- 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 936d12d4600198f5a00c127d168aea0a9c19955f..ad54d7f664f88e0665aa9c89174a53e7fc3b4bfb 100644 (file)
--- 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))