(make_stand_in_procs_weak): backport: compat

bugfix for GUILE 1.6.4.

diff --git a/ChangeLog b/ChangeLog
index 0ab62d987bb01a328a4d8e0733999446c78ef27c..ece323701334f36dcf25b5839139e3535a91f1b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/ly-module.cc (make_stand_in_procs_weak): backport: compat
+       bugfix for GUILE 1.6.4.
+
 2005-08-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scripts/lilypond-book.py (get_latex_textwidth): bugfix for splitext().

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 4821a4e4f1a87f3699bde899175c6b92c8e66b5c..931789e3e62817940ac112302b68447718747d92 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -228,6 +228,14 @@ redefine_keyval (void *closure, SCM key, SCM val, SCM result)
 void
 make_stand_in_procs_weak ()
 {
+  /*
+    Ugh, ABI breakage for 1.6.5: scm_stand_in_procs is a hashtab from
+    1.6.5 on.
+   */
+  if (scm_is_pair (scm_stand_in_procs))
+    {
+      return; 
+    }
   SCM old_tab = scm_stand_in_procs;
   SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));