lilypond-1.3.60

diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index f8454664ed05c401a3b75f7506ba50efcdce7b8a..d496d25bc91c0d421cf972d1b2bf30dec3d65a35 100644 (file)
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -38,15 +38,12 @@ return s;\
  */
 #define IMPLEMENT_SMOBS(CL)\
 long CL::smob_tag_;\
-static scm_smobfuns CL ## _funs = {                                    \
-  CL::mark_smob, CL::free_smob,                                                \
-  CL::print_smob, 0,                                                   \
-};                                                                     \
 void                                                                   \
 CL::init_smobs ()                                                      \
 {                                                                      \
-  smob_tag_ = scm_newsmob (&CL ## _funs);                                      \
-}                                                                      \
+  smob_tag_ = scm_make_smob_type_mfpe ( \
+     #CL, 0, CL::mark_smob, CL::free_smob, CL::print_smob, 0);\
+}\
                                                                        \
                                                                         \
 void                                                                    \

diff --git a/lily/score-element-callback.cc b/lily/score-element-callback.cc
index a155603891e64627cf0a26a0a5c72372d3d33085..7b701b15bd9ee96862b1d3fa4cf060f9bbb324bb 100644 (file)
--- a/lily/score-element-callback.cc
+++ b/lily/score-element-callback.cc
@@ -30,15 +30,12 @@ scm_sizet free_smob (SCM)
   return 0;
 }
 
-static scm_smobfuns callback_funs = {
-  mark_smob, free_smob,
-  print_smob, 0,
-};
-
 static
 void start_callback_smobs()
 {
-  callback_tag = scm_newsmob (&callback_funs);
+  callback_tag = scm_make_smob_type_mfpe ("callback", 0,
+                                         mark_smob, free_smob,
+                                         print_smob, 0);
 }