From 0ef4ae82e69e610b326263fe753849f7edbeabec Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Sat, 25 Oct 1997 21:54:46 +0000 Subject: [PATCH] * print.h (SCM_COERCE_OPORT): Renamed to SCM_COERCE_OUTPORT. An OPORT is an `open' port, not an output port. --- libguile/print.c | 6 +++--- libguile/print.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libguile/print.c b/libguile/print.c index ec7d2fcd5..cdd4b892b 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -220,7 +220,7 @@ print_state_printer (obj, port) port, SCM_ARG2, s_print_state_printer); - port = SCM_COERCE_OPORT (port); + port = SCM_COERCE_OUTPORT (port); scm_puts ("#', port); @@ -917,7 +917,7 @@ scm_newline (port) else SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG1, s_newline); - scm_putc ('\n', SCM_COERCE_OPORT (port)); + scm_putc ('\n', SCM_COERCE_OUTPORT (port)); #ifdef HAVE_PIPE # ifdef EPIPE if (EPIPE == errno) @@ -943,7 +943,7 @@ scm_write_char (chr, port) SCM_ASSERT (scm_valid_oport_value_p (port), port, SCM_ARG2, s_write_char); SCM_ASSERT (SCM_ICHRP (chr), chr, SCM_ARG1, s_write_char); - scm_putc ((int) SCM_ICHR (chr), SCM_COERCE_OPORT (port)); + scm_putc ((int) SCM_ICHR (chr), SCM_COERCE_OUTPORT (port)); #ifdef HAVE_PIPE # ifdef EPIPE if (EPIPE == errno) diff --git a/libguile/print.h b/libguile/print.h index 00d724d51..b686ed8bd 100644 --- a/libguile/print.h +++ b/libguile/print.h @@ -70,9 +70,9 @@ extern scm_option scm_print_opts[]; #define SCM_WRITINGP(pstate) ((pstate)->writingp) #define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); } -#define SCM_COERCE_OPORT(p) ((SCM_NIMP (p) && SCM_PRINT_STATE_P (SCM_CDR (p))) \ - ? SCM_CAR (p) \ - : p) +#define SCM_COERCE_OUTPORT(p) ((SCM_NIMP (p) && SCM_PRINT_STATE_P (SCM_CDR (p))) \ + ? SCM_CAR (p) \ + : p) #define SCM_PRINT_STATE_LAYOUT "sruwuwuwuwuwpwuwuwuruopr" typedef struct scm_print_state {