diff options
author | Andy Wingo <wingo@pobox.com> | 2016-05-13 11:34:52 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2016-05-13 11:34:52 +0200 |
commit | 08574987d95c1dbe019398ef5aeb5642f08ac49c (patch) | |
tree | af1e31bd97b0305692e3cc23524236e7fc218250 /libguile/poll.c | |
parent | e5d2f4e566586f768bda99c28a74fd2303ecace1 (diff) | |
download | guile-08574987d95c1dbe019398ef5aeb5642f08ac49c.tar.gz |
Remove scm_t_port_internal
* libguile/ports-internal.h (SCM_PORT): Rename from SCM_PTAB_ENTRY.
(scm_t_port_internal, SCM_PORT_GET_INTERNAL): Remove.
(SCM_FILENAME, SCM_SET_FILENAME, SCM_LINUM, SCM_COL): Adapt.
* libguile/ports.c:
* libguile/poll.c:
* libguile/ioext.c:
* libguile/fports.c:
* libguile/filesys.c:
* libguile/print.c:
* libguile/read.c:
* libguile/rw.c:
* libguile/strings.c: Adapt.
Diffstat (limited to 'libguile/poll.c')
-rw-r--r-- | libguile/poll.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/poll.c b/libguile/poll.c index fa90abbcd..64f3cef24 100644 --- a/libguile/poll.c +++ b/libguile/poll.c @@ -107,13 +107,13 @@ scm_primitive_poll (SCM pollfds, SCM nfds, SCM ports, SCM timeout) revents |= POLLERR; else { - scm_t_port_internal *pti = SCM_PORT_GET_INTERNAL (port); + scm_t_port *pt = SCM_PORT (port); - if (scm_port_buffer_can_take (pti->read_buf) > 0) + if (scm_port_buffer_can_take (pt->read_buf) > 0) /* Buffered input waiting to be read. */ revents |= POLLIN; if (SCM_OUTPUT_PORT_P (port) - && scm_port_buffer_can_put (pti->write_buf) > 1) + && scm_port_buffer_can_put (pt->write_buf) > 1) /* Buffered output possible. The "> 1" is because writing the last byte would flush the port. */ revents |= POLLOUT; @@ -145,13 +145,13 @@ scm_primitive_poll (SCM pollfds, SCM nfds, SCM ports, SCM timeout) revents |= POLLERR; else { - scm_t_port_internal *pti = SCM_PORT_GET_INTERNAL (port); + scm_t_port *pt = SCM_PORT (port); - if (scm_port_buffer_can_take (pti->read_buf) > 0) + if (scm_port_buffer_can_take (pt->read_buf) > 0) /* Buffered input waiting to be read. */ revents |= POLLIN; if (SCM_OUTPUT_PORT_P (port) - && scm_port_buffer_can_put (pti->write_buf) > 1) + && scm_port_buffer_can_put (pt->write_buf) > 1) /* Buffered output possible. The "> 1" is because writing the last byte would flush the port. */ revents |= POLLOUT; |