Index: include/libroar/vio.h
===================================================================
--- include/libroar/vio.h	(revision 5276)
+++ include/libroar/vio.h	(revision 5278)
@@ -43,20 +43,17 @@
 // sys io:
 
+typedef int32_t       roar_vio_ctl_t;
+typedef int_least64_t roar_off_t;
+
 struct roar_vio_calls {
- void * inst;
-/*
- ssize_t (*read) (int fd, void *buf, size_t count, void * inst);
- ssize_t (*write)(int fd, void *buf, size_t count, void * inst);
- off_t   (*lseek)(int fildes, off_t offset, int whence, void * inst);
-*/
- ssize_t (*read    )(struct roar_vio_calls * vio, void *buf, size_t count);
- ssize_t (*write   )(struct roar_vio_calls * vio, void *buf, size_t count);
- off_t   (*lseek   )(struct roar_vio_calls * vio, off_t offset, int whence);
-// int     (*nonblock)(struct roar_vio_calls * vio, int state);
- int     (*sync    )(struct roar_vio_calls * vio);
- int     (*ctl     )(struct roar_vio_calls * vio, int cmd, void * data);
- int     (*close   )(struct roar_vio_calls * vio);
- uint32_t flags;
- size_t   refc;
+ size_t           refc;
+ uint32_t         flags;
+ void            *inst;
+ ssize_t        (*read    )(struct roar_vio_calls * vio, void *buf, size_t count);
+ ssize_t        (*write   )(struct roar_vio_calls * vio, void *buf, size_t count);
+ roar_off_t     (*lseek   )(struct roar_vio_calls * vio, roar_off_t offset, int whence);
+ int            (*sync    )(struct roar_vio_calls * vio);
+ int            (*ctl     )(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
+ int            (*close   )(struct roar_vio_calls * vio);
 };
 
@@ -72,8 +69,8 @@
 ssize_t roar_vio_read    (struct roar_vio_calls * vio, void *buf, size_t count) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
 ssize_t roar_vio_write   (struct roar_vio_calls * vio, void *buf, size_t count) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
-off_t   roar_vio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
+roar_off_t   roar_vio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
 int     roar_vio_nonblock(struct roar_vio_calls * vio, int state) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL;
 int     roar_vio_sync    (struct roar_vio_calls * vio) _LIBROAR_ATTR_NONNULL_ALL;
-int     roar_vio_ctl     (struct roar_vio_calls * vio, int cmd, void * data) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL(1);
+int     roar_vio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL(1);
 int     roar_vio_close   (struct roar_vio_calls * vio) _LIBROAR_ATTR_NONNULL_ALL;
 
@@ -103,7 +100,7 @@
 ssize_t roar_vio_basic_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_basic_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_basic_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
+roar_off_t   roar_vio_basic_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_basic_sync    (struct roar_vio_calls * vio);
-int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_basic_close   (struct roar_vio_calls * vio);
 
@@ -118,7 +115,7 @@
 ssize_t roar_vio_pass_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_pass_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_pass_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
+roar_off_t   roar_vio_pass_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     roar_vio_pass_sync    (struct roar_vio_calls * vio);
-int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     roar_vio_pass_close   (struct roar_vio_calls * vio);
 
@@ -128,5 +125,5 @@
 ssize_t roar_vio_re_read (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_re_write(struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_re_lseek(struct roar_vio_calls * vio, off_t offset, int whence);
+roar_off_t   roar_vio_re_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence);
 
 #endif
