From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 26 Feb 2005 11:20:36 +0000 (+0000)
Subject: add ALIAS_FILE_TO_FILECOOKIE
X-Git-Tag: release/2.5.14~89
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=959623a4b11b4dda371025e76c6500fdf0be2a4a;p=lilypond.git

add ALIAS_FILE_TO_FILECOOKIE
to define. We don't want to override fprintf everywhere.
---

diff --git a/THANKS b/THANKS
index 4171c2e4e3..dd65806ec8 100644
--- a/THANKS
+++ b/THANKS
@@ -33,6 +33,8 @@ Steve Doonan
 
 BUG HUNTERS/SUGGESTIONS
 
+
+Jose Miguel Pasini
 Alexandre Beneteau
 Andreas Scherer
 Anthony W. Youngman
diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index b77b7b7da7..5ca5a1f579 100644
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -53,6 +53,8 @@ extern "C" {
 #include <libio.h>
 #else
 
+#ifdef ALIAS_FILE_TO_FILECOOKIE
+  
 #define cookie_io_functions_t le_cookie_io_functions_t 
   typedef struct
   {
@@ -81,7 +83,8 @@ extern "C" {
 #undef putc
 #endif
 #define putc handle_cookie_io_putc
-
+#endif /* ALIAS_FILE_TO_FILECOOKIE */
+  
 #endif /* ! HAVE_FUNOPEN */
 
 #endif /* ! HAVE_FOPENCOOKIE */
diff --git a/ttftool/ps.c b/ttftool/ps.c
index 6d75bbb40a..b567a2c4b1 100644
--- a/ttftool/ps.c
+++ b/ttftool/ps.c
@@ -7,6 +7,8 @@
 #include "types.h"
 #include "proto.h"
 
+#define ALIAS_FILE_TO_FILECOOKIE
+
 #include "libc-extension.hh"
 
 #define CHUNKSIZE 65534
diff --git a/ttftool/ttfps.c b/ttftool/ttfps.c
index 6e8a0add73..8174770581 100644
--- a/ttftool/ttfps.c
+++ b/ttftool/ttfps.c
@@ -8,6 +8,7 @@
 #include "types.h"
 #include "proto.h"
 
+#define ALIAS_FILE_TO_FILECOOKIE
 #include "libc-extension.hh"
 
 static void endianness_test (void);
diff --git a/ttftool/util.c b/ttftool/util.c
index 355d2b762f..f53656c2ba 100644
--- a/ttftool/util.c
+++ b/ttftool/util.c
@@ -9,6 +9,8 @@
 #include "types.h"
 #include "proto.h"
 
+#define ALIAS_FILE_TO_FILECOOKIE
+
 #include "libc-extension.hh"
 
 void *