From: fred Date: Wed, 27 Mar 2002 02:03:44 +0000 (+0000) Subject: lilypond-1.5.18 X-Git-Tag: release/1.5.59~425 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3683757a1fb7666ae553411c00d2ecfa1d11a21b;p=lilypond.git lilypond-1.5.18 --- diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 6a4da6320e..f1f45fa8c8 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -36,7 +36,7 @@ } \context LyricsVoice = "v-2" \lyrics { \property LyricsVoice . stanza = "2:" - x x x __ x + x x x __ x. } > } diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 7cc9232bf2..54c9decd29 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -23,6 +23,15 @@ /* Guile 1.3.4 compatibility */ #if GUILE_MINOR_VERSION < 4 + +#ifndef SCM_CELL_TYPE +#define SCM_CELL_TYPE(X) SCM_CAR (X) +#endif + +#ifndef SCM_CELL_WORD_1 +#define SCM_CELL_WORD_1(X) SCM_CDR (X) +#endif + #define scm_bits_t SCM #define fix_guile_1_3_4_scm_puts(scm_data, port) scm_puts ((char*)scm_data, port)