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/ioext.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/ioext.c')
-rw-r--r-- | libguile/ioext.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libguile/ioext.c b/libguile/ioext.c index 68f069313..58a6219f3 100644 --- a/libguile/ioext.c +++ b/libguile/ioext.c @@ -91,20 +91,19 @@ SCM_DEFINE (scm_redirect_port, "redirect-port", 2, 0, 0, buffers. */ if (SCM_OUTPUT_PORT_P (old)) scm_flush (old); - if (SCM_INPUT_PORT_P (old) && SCM_PORT_GET_INTERNAL (old)->rw_random) + if (SCM_INPUT_PORT_P (old) && SCM_PORT (old)->rw_random) scm_end_input (old); if (SCM_OUTPUT_PORT_P (new)) scm_flush (new); - if (SCM_INPUT_PORT_P (new) && SCM_PORT_GET_INTERNAL (new)->rw_random) + if (SCM_INPUT_PORT_P (new) && SCM_PORT (new)->rw_random) scm_end_input (new); ans = dup2 (oldfd, newfd); if (ans == -1) SCM_SYSERROR; - SCM_PORT_GET_INTERNAL (new)->rw_random = - SCM_PORT_GET_INTERNAL (old)->rw_random; + SCM_PORT (new)->rw_random = SCM_PORT (old)->rw_random; } return SCM_UNSPECIFIED; } |