Fix 1141 and 1142.

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

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 581984dfe9951495bd4320684d8d1f562784ae94..7a6441036410d02f7b3dfe93951486b6236438cf 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,9 +1,20 @@
 /*
-  ly-module.cc -- implement guile module stuff.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "lily-guile.hh"
@@ -97,9 +108,11 @@ ly_module_symbols (SCM mod)
 }
 
 static SCM
-entry_to_alist (void *closure, SCM key, SCM val, SCM result)
+entry_to_alist (void * /* closure */,
+               SCM key,
+               SCM val,
+               SCM result)
 {
-  (void) closure;
   if (scm_variable_bound_p (val) == SCM_BOOL_T)
     return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
   programming_error ("unbound variable in module");
@@ -108,12 +121,13 @@ entry_to_alist (void *closure, SCM key, SCM val, SCM result)
 
 LY_DEFINE (ly_module_2_alist, "ly:module->alist",
           1, 0, 0, (SCM mod),
-          "Dump the contents of  module @var{mod} as an alist.")
+          "Dump the contents of module @var{mod} as an alist.")
 {
   SCM_VALIDATE_MODULE (1, mod);
   SCM obarr = SCM_MODULE_OBARRAY (mod);
 
-  return scm_internal_hash_fold ((Hash_closure_function) & entry_to_alist, NULL, SCM_EOL, obarr);
+  return scm_internal_hash_fold ((scm_t_hash_fold_fn) &entry_to_alist,
+                                NULL, SCM_EOL, obarr);
 }
 
 void
@@ -131,55 +145,3 @@ ly_reexport_module (SCM mod)
 {
   ly_export (mod, ly_module_symbols (mod));
 }
-
-#ifdef MODULE_GC_KLUDGE
-static SCM
-redefine_keyval (void *closure, SCM key, SCM val, SCM result)
-{
-  (void)closure;
-  SCM new_tab = result;
-  scm_hashq_set_x (new_tab, key, val);
-  return new_tab;
-}
-
-/*
-  UGH UGH.
-  Kludge for older GUILE 1.6 versions.
-*/
-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; 
-    }
-      
-  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;
-  
-  
-  SCM old_tab = scm_stand_in_procs;
-  SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));
-
-  new_tab = scm_internal_hash_fold ((Hash_closure_function) & redefine_keyval,
-                                   NULL,
-                                   new_tab,
-                                   old_tab);
-
-  scm_stand_in_procs = new_tab;
-}
-
-ADD_SCM_INIT_FUNC (make_stand_in_procs_weak, make_stand_in_procs_weak);
-#endif