Re: LilyPond 2.5.13 won't compile on MacOS X

[Matthias Neeracher]

On Feb 28, 2005, at 11:01 AM, Jan Nieuwenhuizen wrote:

> Matthias Neeracher writes:
>
> > MacOS X is one of the platforms without libio, and it seems that the
> > changes in 2.5.13 to accommodate those are not enough yet. Do I have
> > to manually define ALIAS_FILE_TO_FILECOOKIE on my platform?
>
> No, it was (hopefully) broken by a bit carelessly placed ifdef that
> was not tested.
>
> Can you try the patch below?

It seems that the HAVE_FUNOPEN implementation of fopencookie falsely had declared its 3rd parameter to be

cookie_io_functions_t * 

instead  of plain

cookie_io_functions_t

This fixed it:

diff -ruN lilypond-2.5.13-orig/flower/libc-extension.cc lilypond-2.5.13/flower/libc-extension.cc
--- lilypond-2.5.13-orig/flower/libc-extension.cc       Mon Feb 28 08:49:45 2005
+++ lilypond-2.5.13/flower/libc-extension.cc    Mon Feb 28 19:00:48 2005
@@ -163,9 +163,9 @@
#if HAVE_FUNOPEN


FILE *
-  fopencookie (void *cookie, char const *mode, cookie_io_functions_t *fun)
+  fopencookie (void *cookie, char const *mode, cookie_io_functions_t fun)
{
-    return funopen (cookie, fun->read, fun->write, fun->seek, fun->close);
+    return funopen (cookie, fun.read, fun.write, fun.seek, fun.close);
}


#else /* ! HAVE_FUNOPEN */

The package now compiles, but does not run, apparently because latin1.enc is no longer installed.

Matthias