X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=740f9e4e521ceda5fb92eb6d417a2b9648dbe75c;hb=11d798c148ed70ecbfdf682c5588b4bf6636dcec;hp=9ce3b380877864b9ead3cbf5fe42d3cea1f1253c;hpb=38deaf647921312c149a1b68f00d2bee6f749d2d;p=lilypond.git

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 9ce3b38087..740f9e4e52 100644
--- 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
@@ -85,13 +85,7 @@ ly_use_module (SCM mod, SCM used)
 
 #define FUNC_NAME __FUNCTION__
 
-static SCM
-accumulate_symbol (void *closure, SCM key, SCM val, SCM result)
-{
-  (void) closure;
-  (void) val;
-  return scm_cons (key, result);
-}
+
 
 SCM
 ly_module_symbols (SCM mod)
@@ -99,8 +93,7 @@ ly_module_symbols (SCM mod)
   SCM_VALIDATE_MODULE (1, mod);
 
   SCM obarr = SCM_MODULE_OBARRAY (mod);
-  return scm_internal_hash_fold ((Hash_closure_function) & accumulate_symbol,
-				 NULL, SCM_EOL, obarr);
+  return ly_hash_table_keys (obarr);
 }
 
 static SCM
@@ -156,13 +149,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;