From: fred <fred>
Date: Tue, 26 Mar 2002 23:22:56 +0000 (+0000)
Subject: lilypond-1.3.60
X-Git-Tag: release/1.5.59~1583
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3d76a4238c2a6fa6e2624404c1e3b1feacba705f;p=lilypond.git

lilypond-1.3.60
---

diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index f8454664ed..d496d25bc9 100644
--- 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 a155603891..7b701b15bd 100644
--- 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);
 }