--- src/lib/libc/stdio/funopen.c	2004/06/07 20:35:41	1.4
+++ src/lib/libc/stdio/funopen.c	2005/07/23 20:23:06	1.5
@@ -43,13 +43,13 @@
 #include <errno.h>
 
 #include "local.h"
+#include "priv_stdio.h"
 
 FILE *
-funopen(cookie, readfn, writefn, seekfn, closefn)
-	const void *cookie;
-	int (*readfn)(), (*writefn)();
-	fpos_t (*seekfn)(void *cookie, fpos_t off, int whence);
-	int (*closefn)();
+funopen(const void *cookie, int (*readfn)(void *, char *, int),
+	int (*writefn)(void *, const char *, int),
+	fpos_t (*seekfn)(void *cookie, fpos_t off, int whence),
+	int (*closefn)(void *))
 {
 	FILE *fp;
 	int flags;
@@ -68,8 +68,8 @@ funopen(cookie, readfn, writefn, seekfn,
 	}
 	if ((fp = __sfp()) == NULL)
 		return (NULL);
-	fp->_flags = flags;
-	fp->_file = -1;
+	fp->pub._flags = flags;
+	fp->pub._fileno = -1;
 	fp->_cookie = (void *)cookie;
 	fp->_read = readfn;
 	fp->_write = writefn;