summaryrefslogtreecommitdiff
path: root/libguile/ports.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-05-13 10:32:46 +0200
committerAndy Wingo <wingo@pobox.com>2011-05-13 13:48:07 +0200
commit2e16a342f226b97e47fd2cd30c367ebca2a3080c (patch)
treee0e1241a60d99b70ae854fe8922957f9977e1f7d /libguile/ports.c
parent210c0325d38abc7409b34b6b4724a297c5524eb5 (diff)
downloadguile-2e16a342f226b97e47fd2cd30c367ebca2a3080c.tar.gz
fix type errors
* libguile/numbers.c (scm_logand): Fix a type error (comparing a SCM against an int, when we really wanted to compare the unpacked fixnum). * libguile/ports.c (scm_i_set_conversion_strategy_x): Check scm_conversion_strategy_init, not scm_conversion_strategy. * libguile/read.c (recsexpr): Fix loops to avoid strange test of SCM values.
Diffstat (limited to 'libguile/ports.c')
-rw-r--r--libguile/ports.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/ports.c b/libguile/ports.c
index 926149bf9..f3d1d2d89 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -2317,7 +2317,7 @@ scm_i_set_conversion_strategy_x (SCM port,
if (scm_is_false (port))
{
/* Set the default encoding for future ports. */
- if (!scm_conversion_strategy
+ if (!scm_conversion_strategy_init
|| !scm_is_fluid (SCM_VARIABLE_REF (scm_conversion_strategy)))
scm_misc_error (NULL, "tried to set conversion strategy fluid before it is initialized",
SCM_EOL);