From bb5e72e7ac8995a04e16fae7bae5b342861601cd Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 6 Jun 2005 22:59:12 +0000 Subject: [PATCH] Compile fix. --- ChangeLog | 7 ++++++- flower/include/file-cookie.hh | 4 ++-- make/substitute.make | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbd565de47..1562d7edba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-06-07 Jan Nieuwenhuizen + + * flower/include/file-cookie.hh: Compile fix. + 2005-06-06 Han-Wen Nienhuys * ly/engraver-init.ly: add \defaultchild to InnerStaffGroup. @@ -42,7 +46,8 @@ 2005-06-06 Han-Wen Nienhuys - * flower/memory-stream.cc (Memory_out_stream): remove fopencookie support. + * flower/memory-stream.cc (Memory_out_stream): remove fopencookie + support. * ttftool/ttfps.c: use lily_cookie functions everywhere. diff --git a/flower/include/file-cookie.hh b/flower/include/file-cookie.hh index f523c897da..571e4a74db 100644 --- a/flower/include/file-cookie.hh +++ b/flower/include/file-cookie.hh @@ -12,8 +12,8 @@ extern "C" { typedef struct { - int (*read) (void *, char *, size_t); - int (*write) (void *, char const *, size_t); + ssize_t (*read) (void *, char *, size_t); + ssize_t (*write) (void *, char const *, size_t); int (*seek) (void *, off64_t *, int); int (*close) (void *); } lily_cookie_io_functions_t; diff --git a/make/substitute.make b/make/substitute.make index 289856b0f2..b28874f118 100644 --- a/make/substitute.make +++ b/make/substitute.make @@ -24,6 +24,7 @@ ATVARIABLES = \ datadir\ date\ lilypond_datadir\ + lilypond_docdir\ lilypond_libdir\ local_lilypond_datadir\ local_lilypond_libdir\ -- 2.39.2