X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook-scheme.cc;h=c63f47dd078b49597c22ee8aeaef54368cb564d6;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=5512521bd55bf817f667eaddc87de986072315bc;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git diff --git a/lily/book-scheme.cc b/lily/book-scheme.cc index 5512521bd5..c63f47dd07 100644 --- a/lily/book-scheme.cc +++ b/lily/book-scheme.cc @@ -22,7 +22,6 @@ #include "output-def.hh" #include "score.hh" #include "paper-book.hh" -#include "ly-module.hh" LY_DEFINE (ly_make_book, "ly:make-book", 2, 0, 1, (SCM paper, SCM header, SCM scores), @@ -153,7 +152,7 @@ LY_DEFINE (ly_book_header, "ly:book-header", { LY_ASSERT_SMOB (Book, book, 1); Book *b = unsmob (book); - return b->header_ ? b->header_ : SCM_BOOL_F; + return ly_is_module (b->header_) ? b->header_ : SCM_BOOL_F; } LY_DEFINE (ly_book_set_header_x, "ly:book-set-header!", @@ -179,4 +178,4 @@ LY_DEFINE (ly_book_scores, "ly:book-scores", } -const char Book::type_p_name_[] = "ly:book?"; +const char * const Book::type_p_name_ = "ly:book?";