From 4b54303fe9248242e8e74804c394e45570df23db Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 13 Jun 2000 18:08:05 +0200
Subject: [PATCH] patch::: 1.3.59.uu1

---
 VERSION                        | 2 +-
 lily/include/ly-smobs.icc      | 9 +++------
 lily/lily-guile.cc             | 2 +-
 lily/score-element-callback.cc | 9 +++------
 scm/lily.scm                   | 4 +++-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/VERSION b/VERSION
index 484be829b2..1810523f67 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=59
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
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/lily-guile.cc b/lily/lily-guile.cc
index 9f5b91fa93..6f96577310 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -373,7 +373,7 @@ ly_number2string (SCM s)
   return gh_str02scm (str);
 }
 
-// #define TEST_GC
+#define TEST_GC
 
 #ifdef TEST_GC
 #include <libguile/gc.h>
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);
 }
 
 
diff --git a/scm/lily.scm b/scm/lily.scm
index 42b517f5d0..ded3b1ff30 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -291,9 +291,11 @@
     (string-append "% " s))
   
   (define (end-output) 
+	(begin
+		(display (gc-stats))
     (string-append "\n\\EndLilyPondOutput"
 		   ; Put GC stats here.
-		   ))
+		   )))
   
   (define (experimental-on)
     "")
-- 
2.39.5