--- libaitio/src/bufio.c	2012/03/08 23:14:59	1.2.2.1
+++ libaitio/src/bufio.c	2012/04/02 09:10:30	1.4.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bufio.c,v 1.2.2.1 2012/03/08 23:14:59 misho Exp $
+* $Id: bufio.c,v 1.4.2.1 2012/04/02 09:10:30 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -70,8 +70,13 @@ cf_(struct tagBufIO *buf)
 	return 0;
 }
 
+#ifdef __NetBSD__
+static off_t
+sf_lim(struct tagBufIO *buf, off_t pos, int w)
+#else
 static fpos_t
 sf_lim(struct tagBufIO *buf, fpos_t pos, int w)
+#endif
 {
 	if (!buf)
 		goto err;
@@ -134,8 +139,13 @@ wf_lim(struct tagBufIO *buf, const char *dat, int siz)
 	return siz;
 }
 
+#ifdef __NetBSD__
+static off_t
+sf_inf(struct tagBufIO *buf, off_t pos, int w)
+#else
 static fpos_t
 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
+#endif
 {
 	void *b;
 
@@ -233,7 +243,7 @@ wf_inf(struct tagBufIO *buf, const char *dat, int siz)
 
 
 /*
- * io_fmemopen() File buffered stream operations over memory block
+ * io_fmemopen() - File buffered stream operations over memory block
  *
  * @base = Base address of memory block, if =NULL Infinit length(auto-grow)
  * @basesize = Size of memory block
@@ -273,9 +283,21 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 	buf->buf_base = *base;
 	buf->buf_size = basesize;
 
+#ifdef __NetBSD__
 	if (buf->buf_mode == BUFIO_MODE_INFINIT)
 		f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, 
 				(int (*)(void *, char const *, int)) wf_inf, 
+				(off_t (*)(void *, off_t, int)) sf_inf, 
+				(int (*)(void *)) cf_);
+	else
+		f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, 
+				(int (*)(void *, char const *, int)) wf_lim, 
+				(off_t (*)(void *, off_t, int)) sf_lim, 
+				(int (*)(void *)) cf_);
+#else
+	if (buf->buf_mode == BUFIO_MODE_INFINIT)
+		f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, 
+				(int (*)(void *, char const *, int)) wf_inf, 
 				(fpos_t (*)(void *, fpos_t, int)) sf_inf, 
 				(int (*)(void *)) cf_);
 	else
@@ -283,6 +305,7 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 				(int (*)(void *, char const *, int)) wf_lim, 
 				(fpos_t (*)(void *, fpos_t, int)) sf_lim, 
 				(int (*)(void *)) cf_);
+#endif
 	if (!f) {
 		LOGERR;
 		if (buf->buf_mode == BUFIO_MODE_INFINIT) {
@@ -297,7 +320,7 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 }
 
 /*
- * io_fmapopen() File buffered stream operations over MMAP block
+ * io_fmapopen() - File buffered stream operations over MMAP block
  *
  * @csFile = Filename for MMAP, if =NULL private MMAP block
  * @mode = File open mode
@@ -363,10 +386,17 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 	buf->buf_size = basesize;
 	buf->buf_unmap = unmap_cf;
 
+#ifdef __NetBSD__
 	f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, 
 			(int (*)(void *, char const *, int)) wf_lim, 
+			(off_t (*)(void *, off_t, int)) sf_lim, 
+			(int (*)(void *)) cf_);
+#else
+	f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, 
+			(int (*)(void *, char const *, int)) wf_lim, 
 			(fpos_t (*)(void *, fpos_t, int)) sf_lim, 
 			(int (*)(void *)) cf_);
+#endif
 	if (!f) {
 		LOGERR;
 		free(buf);
@@ -378,7 +408,7 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 }
 
 /*
- * io_dumbFile() Create empry or dumb file with fixed size
+ * io_dumbFile() - Create empry or dumb file with fixed size
  *
  * @csFile = Filename for create
  * @mode = File access permissions
@@ -411,7 +441,7 @@ err:
 }
 
 /*
- * io_fd2buf() Convert open file handle to buffered file I/O
+ * io_fd2buf() - Convert open file handle to buffered file I/O
  *
  * @fd = File handle
  * @mode = Permissions for new buffered file I/O