From: Neil Puttock <n.puttock@gmail.com>
Date: Sat, 18 Jun 2011 17:47:03 +0000 (+0100)
Subject: Compile fix for FreeBSD builds.
X-Git-Tag: release/2.15.2-1^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=295ad53e7b4e3e2b2a0a612f46b184f79c3cc7ce;p=lilypond.git

Compile fix for FreeBSD builds.

* lily/multi-measure-rest.cc (measure_duration_log):

  log2(3) isn't supported in older FreeBSD versions, so use log_2 from
  lily/misc.cc instead
---

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 69b71c9a31..1a9f5e11a7 100644
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -127,7 +127,7 @@ measure_duration_log (Grob *me)
   bool round = to_boolean (me->get_property ("round-to-longer-rest"));
   Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1);
 
-  double duration_log = -log2 (ml.Rational::to_double ());
+  double duration_log = -log_2 (ml.Rational::to_double ());
   int measure_duration_log = int (ceil (duration_log));
   if (round && duration_log - measure_duration_log < 0)
     measure_duration_log--;