* flower/libc-extension.cc:

* flower/include/libc-extension.hh: [Open]BSD simply cast
cookie/funopen declarations.

diff --git a/ChangeLog b/ChangeLog
index b0023811448d246e3f36b5c6b7f1680f0fb20725..9174caa8c22b5e8475fbe392e6ef176c5cbfa338 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * flower/libc-extension.cc:
+       * flower/include/libc-extension.hh: [Open]BSD simply cast
+       cookie/funopen declarations.
+
        * stepmake/aclocal.m4: Check for libkpathsea.so.
 
        * kpath-guile/kpath.c (ly_kpathsea_expand_variable): Use

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index b3da0e54b2caf84215aad70bfefb6d4c0dc3ebb5..9978e237c3dc687f4581fefa85cc900a3d8d4737 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -53,7 +53,7 @@ extern "C" {
 #include <libio.h>
 #else
 
-#if ! HAVE_FUNOPEN
+#if 1 //! HAVE_FUNOPEN
 
 #define cookie_io_functions_t le_cookie_io_functions_t 
   typedef struct

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 6b11b1560f7627539d47cb7f02591f856d89fbbe..b6b32a31cd23c6885e87a947ad79bc0399d8ddc0 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -165,7 +165,16 @@ extern "C" {
   fopencookie (void *cookie, char const *mode, cookie_io_functions_t fun)
   {
     (void) mode;
+#if 0    
     return funopen (cookie, fun.read, fun.write, fun.seek, fun.close);
+#else
+    return funopen (cookie,
+                   (int (*) (void *, char *, int)) fun.read,
+                   (int (*) (void *, char const *, int)) fun.write,
+                   (fpos_t (*) (void *, fpos_t, int)) fun.seek,
+                   (int (*) (void *)) fun.close);
+    
+#endif    
   }
 
 #else /* ! HAVE_FUNOPEN */