CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch: lilypond_2_6
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/31 19:22:42
Modified files:
. : ChangeLog
lily : ly-module.cc
Log message:
(make_stand_in_procs_weak): backport: compat
bugfix for GUILE 1.6.4.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?only_with_tag=lilypond_2_6&tr1=1.3836.2.32&tr2=1.3836.2.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ly-module.cc.diff?only_with_tag=lilypond_2_6&tr1=1.42.2.4&tr2=1.42.2.5&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3836.2.32 lilypond/ChangeLog:1.3836.2.33
--- lilypond/ChangeLog:1.3836.2.32 Tue Aug 30 19:33:32 2005
+++ lilypond/ChangeLog Wed Aug 31 19:22:41 2005
@@ -1,3 +1,8 @@
+2005-08-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/ly-module.cc (make_stand_in_procs_weak): backport: compat
+ bugfix for GUILE 1.6.4.
+
2005-08-30 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scripts/lilypond-book.py (get_latex_textwidth): bugfix for splitext().
Index: lilypond/lily/ly-module.cc
diff -u lilypond/lily/ly-module.cc:1.42.2.4 lilypond/lily/ly-module.cc:1.42.2.5
--- lilypond/lily/ly-module.cc:1.42.2.4 Tue Aug 2 01:10:19 2005
+++ lilypond/lily/ly-module.cc Wed Aug 31 19:22:41 2005
@@ -228,6 +228,14 @@
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));
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
