diff -r 99a34860c105 -r d938228c382e src/server/util/io.h --- a/src/server/util/io.h Wed Nov 02 19:19:01 2022 +0100 +++ b/src/server/util/io.h Sun Nov 06 15:53:32 2022 +0100 @@ -56,7 +56,7 @@ #define IO_POLL_OUT 2 typedef struct IOStream IOStream; -typedef struct SysStream SysStream; +typedef struct Sycx_stream Sycx_stream; typedef struct HttpStream HttpStream; typedef ssize_t(*io_write_f)(IOStream *, void *, size_t); @@ -80,7 +80,7 @@ int io_errno; }; -struct SysStream { +struct Sycx_stream { IOStream st; #ifdef XP_UNIX int fd; @@ -154,15 +154,15 @@ /* system stream */ -IOStream* sysstream_new(pool_handle_t *pool, SYS_SOCKET fd); +IOStream* sycx_stream_new(pool_handle_t *pool, SYS_SOCKET fd); -ssize_t net_sys_write(SysStream *st, void *buf, size_t nbytes); -ssize_t net_sys_writev(SysStream *st, struct iovec *iovec, int iovcnt); -ssize_t net_sys_read(SysStream *st, void *buf, size_t nbytes); -ssize_t net_sys_sendfile(SysStream *st, sendfiledata *sfd); -void net_sys_close(SysStream *st); -void net_sys_setmode(SysStream *st, int mode); -int net_sys_poll(SysStream *st, EventHandler *ev, int events, Event *cb); +ssize_t net_sys_write(Sycx_stream *st, void *buf, size_t nbytes); +ssize_t net_sys_writev(Sycx_stream *st, struct iovec *iovec, int iovcnt); +ssize_t net_sys_read(Sycx_stream *st, void *buf, size_t nbytes); +ssize_t net_sys_sendfile(Sycx_stream *st, sendfiledata *sfd); +void net_sys_close(Sycx_stream *st); +void net_sys_setmode(Sycx_stream *st, int mode); +int net_sys_poll(Sycx_stream *st, EventHandler *ev, int events, Event *cb); /* http stream */ IOStream* httpstream_new(pool_handle_t *pool, IOStream *fd);