diff options
| author | Marius Vollmer <mvo@zagadka.de> | 2004-07-06 10:59:25 +0000 |
|---|---|---|
| committer | Marius Vollmer <mvo@zagadka.de> | 2004-07-06 10:59:25 +0000 |
| commit | 7888309be8638cb5b75db163383a3d977bd9769d (patch) | |
| tree | 1dd35eb478f799c14dfe75756bb870a56ce1ba3f /libguile/vports.c | |
| parent | 9c293a3d2f20f783cc59d749f4d6bcd09fbb0cd5 (diff) | |
| download | guile-7888309be8638cb5b75db163383a3d977bd9769d.tar.gz | |
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
Diffstat (limited to 'libguile/vports.c')
| -rw-r--r-- | libguile/vports.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/vports.c b/libguile/vports.c index a693d5323..7841cbe8a 100644 --- a/libguile/vports.c +++ b/libguile/vports.c @@ -65,7 +65,7 @@ sf_flush (SCM port) { SCM f = SCM_VELTS (stream)[2]; - if (!SCM_FALSEP (f)) + if (scm_is_true (f)) scm_call_0 (f); } } @@ -91,7 +91,7 @@ sf_fill_input (SCM port) SCM ans; ans = scm_call_0 (SCM_VELTS (p)[3]); /* get char. */ - if (SCM_FALSEP (ans) || SCM_EOF_OBJECT_P (ans)) + if (scm_is_false (ans) || SCM_EOF_OBJECT_P (ans)) return EOF; SCM_ASSERT (SCM_CHARP (ans), ans, SCM_ARG1, "sf_fill_input"); { @@ -110,11 +110,11 @@ sf_close (SCM port) { SCM p = SCM_PACK (SCM_STREAM (port)); SCM f = SCM_VELTS (p)[4]; - if (SCM_FALSEP (f)) + if (scm_is_false (f)) return 0; f = scm_call_0 (f); errno = 0; - return SCM_FALSEP (f) ? EOF : 0; + return scm_is_false (f) ? EOF : 0; } @@ -125,7 +125,7 @@ sf_input_waiting (SCM port) if (SCM_VECTOR_LENGTH (p) >= 6) { SCM f = SCM_VELTS (p)[5]; - if (SCM_NFALSEP (f)) + if (scm_is_true (f)) return scm_num2int (scm_call_0 (f), SCM_ARGn, NULL); } /* Default is such that char-ready? for soft ports returns #t, as it |