From c496b95fc4c1d0bda1098945f53c513e56060881 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 1 Mar 2005 08:01:20 +0000 Subject: [PATCH] (outdir)/latin1.enc: Build fix: merge stderr with stdout. --- ChangeLog | 9 +++++++++ flower/libc-extension.cc | 5 ++--- tex/GNUmakefile | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b670bfe5eb..a7c56f3cb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-03-01 Jan Nieuwenhuizen + + * tex/GNUmakefile $(outdir)/latin1.enc: Build fix: + merge stderr with stdout. + +2005-03-01 Jan Nieuwenhuizen + + * flower/libc-extension.cc: Tested BSD compile fix (Matthias Neeracher). + 2005-02-29 Graham Percival * Documentation/user/instrument-notation.teily: moved diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc index 48b6235a0e..a5085047c3 100644 --- a/flower/libc-extension.cc +++ b/flower/libc-extension.cc @@ -1,7 +1,6 @@ /* libc-extension.cc -- compensate for lacking libc functions. - source file of the flowerlib (c) 1997--2005 Han-Wen Nienhuys @@ -163,9 +162,9 @@ extern "C" { #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 */ diff --git a/tex/GNUmakefile b/tex/GNUmakefile index 239f4f8f9b..e264e958b6 100644 --- a/tex/GNUmakefile +++ b/tex/GNUmakefile @@ -20,7 +20,7 @@ $(outdir)/music-drawing-routines.ps: $(depth)/ps/music-drawing-routines.ps $(outdir)/latin1.enc: GNUmakefile echo '/ISOLatin1Encoding' > $@.orig echo 'ISOLatin1Encoding pstack' \ - | gs -sDEVICE=nullpage -quiet - 2>> $@.orig + | gs -sDEVICE=nullpage -quiet - >> $@.orig 2>&1 echo 'def' >> $@.orig sed 's|/minus|/hyphen|' < $@.orig > $@ -- 2.39.5