Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

[lilypond.git] / flower / include / memory-stream.hh

diff --git a/flower/include/memory-stream.hh b/flower/include/memory-stream.hh
index f01c5f4d43043b3e0d304602bbc0925bd2b5bcad..ab8a183a6faf3ac1a6044a9f695053017f7fb7fa 100644 (file)
--- a/flower/include/memory-stream.hh
+++ b/flower/include/memory-stream.hh
@@ -3,17 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MEMORY_STREAM_HH
 #define MEMORY_STREAM_HH
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
+using namespace std;
 
 #include "libc-extension.hh"
+#include "file-cookie.hh"
 
 class Memory_out_stream
 {
@@ -22,7 +23,7 @@ class Memory_out_stream
   int buffer_blocks_;
   FILE *file_;
 
-  static cookie_io_functions_t functions_;
+  static lily_cookie_io_functions_t functions_;
   static const int block_size_;
 
 public: