Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / ly-module.cc

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 9ce3b380877864b9ead3cbf5fe42d3cea1f1253c..45db747819a97ff1a58beb522566d7d8513c5673 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-guile.hh"
 #include "warn.hh"
 #include "main.hh"
-#include "string.hh"
+#include "std-string.hh"
 #include "protected-scm.hh"
 
 #ifdef MODULE_GC_KLUDGE
@@ -156,13 +156,23 @@ redefine_keyval (void *closure, SCM key, SCM val, SCM result)
 void
 make_stand_in_procs_weak ()
 {
-  if (SCM_IS_WHVEC_ANY(scm_stand_in_procs))
+  /*
+    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; 
+    }
+      
+  if (scm_weak_key_hash_table_p (scm_stand_in_procs) == SCM_BOOL_T)
     {
 #if (SCM_MINOR_VERSION == 7) 
       perform_gc_kludge = false;
 #endif
       return; 
     }
+
   
   perform_gc_kludge = true;