From be4269aace4cc63ebd2b2ae6e43bb0189e6280e2 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 5 Jun 2000 16:13:17 +0200
Subject: [PATCH] patch::: 1.3.57.jcn1

1.3.57.jcn1
===========

* Made guile-1.3.5 compile fixes
---
 CHANGES                        |  5 +++++
 VERSION                        |  2 +-
 lily/font-metric.cc            |  5 +++--
 lily/include/ly-smobs.icc      | 14 +++++++++-----
 lily/score-element-callback.cc |  7 +++----
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 83a1f61af0..8de9ee0b5d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.57.jcn1
+===========
+
+* Made guile-1.3.5 compile fixes
+
 1.3.57
 ======
 
diff --git a/VERSION b/VERSION
index 27b50caab0..3e527182ca 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=57
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index f11483f8f0..220eb2a469 100644
--- 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/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 48b3120b24..fe5baaca0c 100644
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -10,6 +10,10 @@
 #ifndef LY_SMOBS_ICC
 #define LY_SMOBS_ICC
 
+#ifndef SCM_PACK
+#define SCM_PACK(x) ((SCM) x)
+#endif
+
 #define IMPLEMENT_UNSMOB(CL, name)		\
 CL *						\
 unsmob_ ## name ( SCM s)			\
@@ -25,8 +29,8 @@ SCM smobify (CL *cl)\
 									\
   SCM_NEWCELL(s);							\
   SCM_SETCAR(s,CL::smob_tag_);						\
-  void * me_p = cl; 							\
-  SCM_SETCDR(s,me_p);							\
+  SCM me_s = SCM_PACK (cl);							\
+  SCM_SETCDR (s, me_s); \
 return s;\
 }\
 
@@ -53,8 +57,8 @@ CL::unsmobify_self ()							 \
   SCM s = self_scm_;							 \
   scm_unprotect_object (s);						 \
   									 \
-  SCM_CAR(self_scm_) = SCM_EOL;	 \
-  SCM_CDR(self_scm_) = SCM_EOL;						 \
+  SCM_SETCAR (self_scm_, SCM_EOL); \
+  SCM_SETCDR (self_scm_, SCM_EOL); \
   self_scm_ = SCM_EOL;							 \
 \
   scm_done_malloc ( - sizeof (CL));\
@@ -88,7 +92,7 @@ CL::free_smob (SCM ses)				\
 \
  /* no need to call scm_unprotect_object, since this call \
     implies that the object is not protected. */ \
-  SCM_CAR(ses) = SCM_EOL;\
+  SCM_SETCAR (ses, SCM_EOL); \
   delete s;\
   return sizeof (CL);\
 } \
diff --git a/lily/score-element-callback.cc b/lily/score-element-callback.cc
index 9e81fe5aa0..a155603891 100644
--- 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;
 }
-- 
2.39.5