lilypond-1.3.58

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index f11483f8f092ee826a22f0c8a1b5e250caf906ff..220eb2a469425cead0d7882e25b861e228ce13a3 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -131,6 +131,7 @@ Font_metric::print_smob (SCM s, SCM port, scm_print_state * )
   return 1;
 }
 
-IMPLEMENT_UNSMOB(Font_metric, metrics);
-IMPLEMENT_SMOBS(Font_metric);
+
+IMPLEMENT_UNSMOB (Font_metric, metrics);
+IMPLEMENT_SMOBS (Font_metric);
 

diff --git a/lily/score-element-callback.cc b/lily/score-element-callback.cc
index 9e81fe5aa06f9b57aefc50ce812b559abc8416c7..a155603891e64627cf0a26a0a5c72372d3d33085 100644 (file)
--- a/lily/score-element-callback.cc
+++ b/lily/score-element-callback.cc
@@ -9,8 +9,7 @@
 
 #include "score-element-callback.hh"
 
-
-static long callback_tag;
+static SCM callback_tag;
 
 static
 SCM mark_smob (SCM)
@@ -49,8 +48,8 @@ smobify_callback (Score_element_callback cb )
   SCM z;
   
   SCM_NEWCELL(z);
-  SCM_SETCDR(z, cb);
-  SCM_SETCAR(z, callback_tag);
+  SCM_SETCDR (z, (SCM)cb);
+  SCM_SETCAR (z, (SCM)callback_tag);
 
   return z;
 }