Merge with master

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index d7973d18b63a1bea0e54e25c4a8a4907536a7a08..84780dd0a2fc489997560a472ab67db2bb18fab3 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -10,7 +10,6 @@
 
 #include "context.hh"
 #include "international.hh"
-#include "lilypond-key.hh"
 #include "music.hh"
 #include "paper-column.hh"
 #include "score-engraver.hh"
@@ -97,8 +96,7 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
           "the grob to be created and the corresponding line number in the "
           "C++ source file.")
 {
-  SCM_ASSERT_TYPE(ly_is_procedure (cb), cb, SCM_ARG1, __FUNCTION__,
-                 "procedure");
+  LY_ASSERT_TYPE (ly_is_procedure, cb, 1);
 
   creation_callback = cb;