1 files changed, 14 insertions, 14 deletions

diff --git a/src/perl/nxt_perl_psgi_layer.h b/src/perl/nxt_perl_psgi_layer.h
index af18ad0d..0972d66f 100644
--- a/src/perl/nxt_perl_psgi_layer.h
+++ b/src/perl/nxt_perl_psgi_layer.h
@@ -14,35 +14,35 @@
 #include <perliol.h>
 
 
+typedef struct nxt_perl_psgi_io_tab_s nxt_perl_psgi_io_tab_t;
 typedef struct nxt_perl_psgi_io_arg_s nxt_perl_psgi_io_arg_t;
 
-typedef long (*nxt_perl_psgi_io_read_f)(PerlInterpreter *my_perl,
-    nxt_perl_psgi_io_arg_t *arg, void *vbuf, size_t length);
-typedef long (*nxt_perl_psgi_io_write_f)(PerlInterpreter *my_perl,
-    nxt_perl_psgi_io_arg_t *arg, const void *vbuf, size_t length);
-typedef long (*nxt_perl_psgi_io_arg_f)(PerlInterpreter *my_perl,
-    nxt_perl_psgi_io_arg_t *arg);
+
+struct nxt_perl_psgi_io_tab_s {
+    SSize_t (*read)(PerlInterpreter *my_perl,
+        nxt_perl_psgi_io_arg_t *arg, void *vbuf, size_t length);
+    SSize_t (*write)(PerlInterpreter *my_perl,
+        nxt_perl_psgi_io_arg_t *arg, const void *vbuf, size_t length);
+};
 
 
 struct nxt_perl_psgi_io_arg_s {
-    SV                        *io;
-    PerlIO                    *fp;
+    SV                            *rv;
+    SV                            *io;
+    PerlIO                        *fp;
 
-    nxt_perl_psgi_io_arg_f    flush;
-    nxt_perl_psgi_io_read_f   read;
-    nxt_perl_psgi_io_write_f  write;
+    const nxt_perl_psgi_io_tab_t  *io_tab;
 
-    void                      *pctx;
+    void                          *req;
 };
 
 
 void nxt_perl_psgi_layer_stream_init(pTHX);
 
-PerlIO *nxt_perl_psgi_layer_stream_fp_create(pTHX_ nxt_perl_psgi_io_arg_t *arg,
+PerlIO *nxt_perl_psgi_layer_stream_fp_create(pTHX_ SV *arg_rv,
     const char *mode);
 void nxt_perl_psgi_layer_stream_fp_destroy(pTHX_ PerlIO *io);
 
 SV *nxt_perl_psgi_layer_stream_io_create(pTHX_ PerlIO *fp);
-void nxt_perl_psgi_layer_stream_io_destroy(pTHX_ SV *rvio);
 
 #endif /* _NXT_PERL_PSGI_LAYER_H_INCLUDED_ */