lilypond-0.1.45

diff --git a/bin/find-typenames.pl b/bin/find-typenames.pl
index e08fd00800578e33c56353b9e507196a196c95f5..890f9cabd060498408f9b93995d36af016b4918e 100644 (file)
--- a/bin/find-typenames.pl
+++ b/bin/find-typenames.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@PERL@
 
 open GREP, "egrep -h '^struct|^class' *.hh *.cc|";
 open OUT, "|sort | uniq";

diff --git a/bin/mudela-book.pl b/bin/mudela-book.pl
index 37206c3c810b9b85131404577219d32e8c8dc64e..bf65dd7806e80896244491bf2adfb05b309baebf 100644 (file)
--- a/bin/mudela-book.pl
+++ b/bin/mudela-book.pl
@@ -1,4 +1,4 @@
-#!@PERL@ -w            
+#!@PERL@ -w
 # -*-Perl-*-
 my $mudcount = 0;
 my $mudela_b = 0;

diff --git a/flower/cpu-timer.cc b/flower/cpu-timer.cc
index c838fe5cc9116b9c83b10bb536442511faaa9300..b288735c1d32058574a9c705bc484c6634a8f9ca 100644 (file)
--- a/flower/cpu-timer.cc
+++ b/flower/cpu-timer.cc
@@ -10,7 +10,13 @@
 
 // nextstep
 #ifndef CLOCKS_PER_SEC
+#ifdef CLK_TCK
 #define CLOCKS_PER_SEC  CLK_TCK
+#elif defined _SC_CLK_TCK
+#define CLOCKS_PER_SEC  sysconf(_SC_CLK_TCK)
+#else
+#error cannot determine CLOCKS_PER_SEC
+#endif
 #endif
 
 

diff --git a/lily/command-request.cc b/lily/command-request.cc
index ee9d34567427ac3d18c81a8bce1bfeddb21ab3ab..661a7fed9f4cf96bbf95f5ccf93a25ee9e8cf3ca 100644 (file)
--- a/lily/command-request.cc
+++ b/lily/command-request.cc
@@ -14,6 +14,7 @@ void
 Command_script_req::do_print() const
 {}
 Command_script_req::Command_script_req(){}
+Command_script_req::~Command_script_req(){}
 
 IMPLEMENT_IS_TYPE_B1(Command_script_req,Command_req);
 

diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh
index a32c861aab853b501e7b880072ccec5c32c086a4..1988dc9adda23f1e00f7dc3e895b935cbbf5ebb7 100644 (file)
--- a/lily/include/command-request.hh
+++ b/lily/include/command-request.hh
@@ -36,6 +36,7 @@ class Command_script_req : public Command_req,  public Script_req {
 public:
     // huh? 
     Command_script_req();
+    ~Command_script_req();
     REQUESTMETHODS(Command_script_req, commandscript);
 };
 

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 0e8c148ef061c34d672c76e763cbe5055dd7e772..28e55399ecef3dbd594b0739529c9fa45056a562 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -10,10 +10,12 @@
 Moment wholes (int dur, int dots);
 double log_2(double x) ;
 int intlog2(int d);
+#if ! defined(_ABS_)
 inline int
 abs (int i){
     return (i < 0)?-i:i;
 }
+#endif
 inline int
 sign (int i) {
     if (i<0) return -1;