CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/06/06 22:59:13
Modified files:
make : substitute.make
flower/include : file-cookie.hh
. : ChangeLog
Log message:
Compile fix.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/substitute.make.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/file-cookie.hh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3727&tr2=1.3728&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3727 lilypond/ChangeLog:1.3728
--- lilypond/ChangeLog:1.3727 Mon Jun 6 20:58:23 2005
+++ lilypond/ChangeLog Mon Jun 6 22:59:12 2005
@@ -1,3 +1,7 @@
+2005-06-07 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * flower/include/file-cookie.hh: Compile fix.
+
2005-06-06 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* ly/engraver-init.ly: add \defaultchild to InnerStaffGroup.
@@ -42,7 +46,8 @@
2005-06-06 Han-Wen Nienhuys <[EMAIL PROTECTED]>
- * 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.
Index: lilypond/flower/include/file-cookie.hh
diff -u lilypond/flower/include/file-cookie.hh:1.1
lilypond/flower/include/file-cookie.hh:1.2
--- lilypond/flower/include/file-cookie.hh:1.1 Mon Jun 6 14:27:42 2005
+++ lilypond/flower/include/file-cookie.hh Mon Jun 6 22:59:12 2005
@@ -12,8 +12,8 @@
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;
Index: lilypond/make/substitute.make
diff -u lilypond/make/substitute.make:1.15 lilypond/make/substitute.make:1.16
--- lilypond/make/substitute.make:1.15 Thu May 12 11:32:49 2005
+++ lilypond/make/substitute.make Mon Jun 6 22:59:12 2005
@@ -24,6 +24,7 @@
datadir\
date\
lilypond_datadir\
+ lilypond_docdir\
lilypond_libdir\
local_lilypond_datadir\
local_lilypond_libdir\
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
