X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fguile-init.cc;h=4270aa01d6b9de89f093bad38df5f300b60545a0;hb=b5de1ca579bc679f69b5df30803fda31a74075d5;hp=3259a465775cb5adab71b1a2409731e1f4d9c892;hpb=652f454fae6ed31ced7f9c3ce22dbc5752460a8c;p=lilypond.git

diff --git a/lily/guile-init.cc b/lily/guile-init.cc
index 3259a46577..4270aa01d6 100644
--- a/lily/guile-init.cc
+++ b/lily/guile-init.cc
@@ -48,8 +48,8 @@ void add_scm_init_func (void (*f) ())
   scm_init_funcs_->push_back (f);
 }
 
-SCM
-ly_init_ly_module (void *)
+void
+ly_init_ly_module ()
 {
   // Start up type system first.
   Scm_init::init ();
@@ -65,15 +65,14 @@ ly_init_ly_module (void *)
     }
 
   scm_primitive_load_path (scm_from_ascii_string ("lily.scm"));
-  return SCM_UNDEFINED;
 }
 
 void
 ly_c_init_guile ()
 {
   Guile_user::module.import ();
-  Lily::module.boot ();
-  scm_c_call_with_current_module (Lily::module, ly_init_ly_module, 0);
+  Lily::module.boot (ly_init_ly_module);
+  Syntax::module.import ();
   Display::module.import ();
   scm_c_use_module ("lily");
 }