Merge with master

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

diff --git a/lily/module-scheme.cc b/lily/module-scheme.cc
index 0e3d98c6123494fff3eb05b2b076b46ca0a9c107..ce08c424567d32a7d45e92bbd0fc79cc01b08d77 100644 (file)
--- a/lily/module-scheme.cc
+++ b/lily/module-scheme.cc
@@ -3,14 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "lily-guile.hh"
+#include "ly-module.hh"
+
 #include "warn.hh"
 #include "main.hh"
-#include "string.hh"
+#include "std-string.hh"
+
 
 /*
   If a variable in changed in SRC, we DEST doesn't see the
@@ -39,20 +40,18 @@ LY_DEFINE (ly_module_copy, "ly:module-copy",
   return SCM_UNSPECIFIED;
 }
 
-LY_DEFINE(ly_clear_anonymous_modules, "ly:clear-anonymous-modules",
-         0, 0, 0, (),
-         "Plug a GUILE 1.6 and 1.7 memory leak by breaking a weak reference "
-         "pointer cycle explicitly."
-         )
+LY_DEFINE (ly_clear_anonymous_modules, "ly:clear-anonymous-modules",
+          0, 0, 0, (),
+          "Plug a GUILE 1.6 and 1.7 memory leak by breaking a weak reference "
+          "pointer cycle explicitly.")
 {
 #ifdef MODULE_GC_KLUDGE
-  clear_anonymous_modules();
+  clear_anonymous_modules ();
 #endif
 
   return SCM_UNSPECIFIED;
 }
 
-
 /* Lookup SYM, but don't give error when it is not defined.  */
 SCM
 ly_module_lookup (SCM module, SCM sym)