add ALIAS_FILE_TO_FILECOOKIE

to define. We don't want to override fprintf everywhere.

diff --git a/THANKS b/THANKS
index 4171c2e4e3981bd42f7cb8b32109777443a697bc..dd65806ec818b25b6c084e50eb3d4b8ee5c006ef 100644 (file)
--- 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 b77b7b7da7ba808e5c1d8d4ff098da341268b9e4..5ca5a1f579f576374ebd2652d203b3cf585d476b 100644 (file)
--- 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 6d75bbb40a60b7a1548625ae22f923c4ba8e0900..b567a2c4b1c1b4619364d2cb1e44da839c1a6660 100644 (file)
--- 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 6e8a0add7325a0fec4ba3ea5ecb1d22d291e5f4e..817477058120c04664a4d70613dc4bac7968b324 100644 (file)
--- 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 355d2b762fe2b475f7d2d2480f7a4ffbbf705763..f53656c2ba8c59d95a9f58de97b3bd60780c7c09 100644 (file)
--- 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 *