X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fmemory-stream.cc;h=9d4c747ef5a41e231a4992b3ebf230c71304bdfd;hb=c9d7db6a073f3824e6d2fd4e87ddd6519abe8c1d;hp=a560a926de96104971934897fe3ce8e5c2c16d82;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc
index a560a926de..9d4c747ef5 100644
--- a/flower/memory-stream.cc
+++ b/flower/memory-stream.cc
@@ -31,14 +31,15 @@ const int Memory_out_stream::block_size_ = 1024;
 
 lily_cookie_io_functions_t
 Memory_out_stream::functions_
-= {
+=
+{
   Memory_out_stream::reader,
   Memory_out_stream::writer,
   Memory_out_stream::seeker,
   Memory_out_stream::cleaner
 };
 
-int
+ssize_t
 Memory_out_stream::cleaner (void *cookie)
 {
   Memory_out_stream *stream = (Memory_out_stream *) cookie;
@@ -87,8 +88,8 @@ Memory_out_stream::get_string () const
 
 ssize_t
 Memory_out_stream::writer (void *cookie,
-			   char const *buffer,
-			   size_t size)
+                           char const *buffer,
+                           size_t size)
 {
   Memory_out_stream *stream = (Memory_out_stream *) cookie;
 
@@ -104,7 +105,7 @@ Memory_out_stream::writer (void *cookie,
 
   if (change)
     stream->buffer_ = (char *) realloc (stream->buffer_,
-					stream->buffer_blocks_ * block_size_);
+                                        stream->buffer_blocks_ * block_size_);
 
   memcpy (stream->buffer_ + stream->size_, buffer, size);
   stream->size_ = newsize;
@@ -114,17 +115,17 @@ Memory_out_stream::writer (void *cookie,
 
 ssize_t
 Memory_out_stream::reader (void * /* cookie */,
-			   char * /* buffer */,
-			   size_t /* size */)
+                           char * /* buffer */,
+                           size_t /* size */)
 {
   assert (false);
   return 0;
 }
 
-int
+ssize_t
 Memory_out_stream::seeker (void *,
-			   off64_t *,
-			   int)
+                           off64_t *,
+                           size_t)
 {
   assert (false);
   return 0;