patch::: 1.3.57.jcn1

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

* Made guile-1.3.5 compile fixes

diff --git a/CHANGES b/CHANGES
index 83a1f61af0deed8a54423ef53e8e6bc07ac26ae1..8de9ee0b5d329983b7f3f6948b9d8a3dbb5f4dc5 100644 (file)
--- 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 27b50caab0a3cc54aa79cabdf5cb1fdd05a0a516..3e527182ca98da8087b27a48cd9d395e9d1a498a 100644 (file)
--- 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 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/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 48b3120b24eef11dff4a4d6d5c5fc8ccc4433b3e..fe5baaca0cfd41cb8951b7408a4ca0a639933703 100644 (file)
--- 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 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;
 }