Compile fix.

diff --git a/ChangeLog b/ChangeLog
index dbd565de479fd189f94a79d816f8ecdd35a74cd2..1562d7edba811eda7f4def0cac155bb8f6defe07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-07  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * flower/include/file-cookie.hh: Compile fix.
+
 2005-06-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * ly/engraver-init.ly: add \defaultchild to InnerStaffGroup. 
@@ -42,7 +46,8 @@
 
 2005-06-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
-       * 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 f523c897da0be3c0102cc927f91b765d6f9a86d9..571e4a74dbba4bba010f787e3ea65e47e52d81bd 100644 (file)
--- 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 289856b0f287efbeccd12dee810f25797970ad1e..b28874f1189b43b6a63e1efe17fdd1f0b05f6d06 100644 (file)
--- 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\