* flower/memory-stream.cc:

* flower/libc-extension.cc: Remove obsolete #undefs.

* flower/include/libc-extension.hh: Bugfix for BSD, place #ifdef
more carefully.

diff --git a/ChangeLog b/ChangeLog
index c59d0d018977c694c642d5e5e3480c28a6f40cc8..9fadc9a6d66689dd4291a9f50db89718e70e1980 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * flower/memory-stream.cc: 
+       * flower/libc-extension.cc: Remove obsolete #undefs.
+
+       * flower/include/libc-extension.hh: Bugfix for BSD, place #ifdef
+       more carefully.
+
 2005-02-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * make/lilypond.fedora.spec.in (Requires): add GS 8.15 as

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 5ca5a1f579f576374ebd2652d203b3cf585d476b..11ee88cef0ffd50491d954ffa3dd85a1b22a9cf0 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -53,8 +53,6 @@ extern "C" {
 #include <libio.h>
 #else
 
-#ifdef ALIAS_FILE_TO_FILECOOKIE
-  
 #define cookie_io_functions_t le_cookie_io_functions_t 
   typedef struct
   {
@@ -75,7 +73,11 @@ extern "C" {
   int handle_cookie_io_fprintf (FILE *file, char const *format, ...);
   int handle_cookie_io_putc (int c, FILE *file);
 
-/* FIXME: ttftool uses fclose fopencookie fprintf and putc only... */
+/* FIXME: ttftool uses fclose fopencookie fprintf and putc only.  if
+          ALIAS_FILE_TO_FILECOOKIE, blondly redefine those functions
+          to wrappers that check for and handle Memory_out_stream.  */
+#ifdef ALIAS_FILE_TO_FILECOOKIE
+
 #define fclose handle_cookie_io_fclose
 #define fprintf handle_cookie_io_fprintf
 #ifdef putc
@@ -83,6 +85,7 @@ extern "C" {
 #undef putc
 #endif
 #define putc handle_cookie_io_putc
+
 #endif /* ALIAS_FILE_TO_FILECOOKIE */
   
 #endif /* ! HAVE_FUNOPEN */

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 8ced60f22ca70556df9d670416f57114c81df90c..48b6235a0ebbe338fe713416000d88305854fb76 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -192,7 +192,6 @@ extern "C" {
     return 0;
   }
 
-#undef fclose
   int 
   handle_cookie_io_fclose (FILE *file)
   {
@@ -201,7 +200,6 @@ extern "C" {
     return fclose (file);
   }
 
-#undef fprintf
   int 
   handle_cookie_io_fprintf (FILE *file, char const *format, ...)
   {
@@ -220,11 +218,6 @@ extern "C" {
     return i;
   }
 
-#ifdef std_putc
-#define putc std_putc
-#else
-#undef putc
-#endif
   int 
   handle_cookie_io_putc (int c, FILE *file)
   {

diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc
index e33ed449e36c3bfbc04c73d45e8b196c15e20974..30e2453fa405abe68ea9d3a58989cb59f9e50faf 100644 (file)
--- a/flower/memory-stream.cc
+++ b/flower/memory-stream.cc
@@ -44,7 +44,6 @@ Memory_out_stream::Memory_out_stream ()
   file_ = fopencookie ((void*) this, "w", functions_);
 }
 
-#undef fclose
 Memory_out_stream::~Memory_out_stream ()
 {
   if (file_)