From: hanwen <hanwen>
Date: Sat, 2 Oct 2004 11:33:32 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/2.3.24^2~96
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6788231193f18fe2532028cc404656fa922ac390;p=lilypond.git

release commit
---

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 055b81a167..69b002b2f3 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -45,6 +45,7 @@ inline double ly_scm2double (SCM x) { return scm_num2dbl (x, "ly_scm2double"); }
 #define scm_from_double(x) (scm_make_real(x))
 
 
+
 #endif /* SCM_MINOR_VERSION < 7 */
 
 #ifndef SMOB_FREE_RETURN_VAL
diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 8fd9ff7aae..80412db155 100644
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -24,13 +24,6 @@ void init_type_ ## CL () \
 } \
 ADD_SCM_INIT_FUNC (init_type_ ## CL, init_type_ ## CL)
 
-#ifndef SCM_CELL_TYPE
-#define SCM_CELL_TYPE(X) SCM_CAR (X)
-#endif
-
-#ifndef SCM_CELL_WORD_1
-#define SCM_CELL_WORD_1(X) SCM_CDR (X)
-#endif
 
 #define IMPLEMENT_BASE_SMOBS(CL) \
 scm_t_bits CL::smob_tag_; \
@@ -57,7 +50,7 @@ CL::init_smobs () \
 size_t \
 CL::free_smob (SCM ses) \
 { \
-  CL *s = (CL*) SCM_CDR (ses); \
+  CL *s = (CL*) SCM_CELL_WORD_1 (ses); \
   delete s; \
   scm_gc_unregister_collectable_memory (s, sizeof (CL), #CL " smob"); \
   return SMOB_FREE_RETURN_VAL(CL); \