diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:51:46 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:51:46 +0200 |
commit | e0513d4d77a7dbf42252a5dddfee62c46a700b9c (patch) | |
tree | 09066826f011a3f4fb6aec31e577773af1f85334 /libguile/read.c | |
parent | 6774820f1e83a388b3232cd61a66340886b395d8 (diff) | |
parent | 2e77f7202b11ad0003831fcff94ec7db80cca015 (diff) | |
download | guile-e0513d4d77a7dbf42252a5dddfee62c46a700b9c.tar.gz |
Merge commit '2e77f7202b11ad0003831fcff94ec7db80cca015' into boehm-demers-weiser-gc
Conflicts:
libguile/threads.c
Diffstat (limited to 'libguile/read.c')
-rw-r--r-- | libguile/read.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libguile/read.c b/libguile/read.c index d1013c586..53715f2b5 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -150,7 +150,7 @@ static SCM *scm_read_hash_procedures; /* `isblank' is only in C99. */ #define CHAR_IS_BLANK_(_chr) \ (((_chr) == ' ') || ((_chr) == '\t') || ((_chr) == '\n') \ - || ((_chr) == '\f')) + || ((_chr) == '\f') || ((_chr) == '\r')) #ifdef MSDOS # define CHAR_IS_BLANK(_chr) \ @@ -182,9 +182,8 @@ static SCM *scm_read_hash_procedures; /* Read an SCSH block comment. */ static inline SCM scm_read_scsh_block_comment (int chr, SCM port); -/* Helper function similar to `scm_read_token ()'. Read from PORT until a - whitespace is read. Return zero if the whole token could fit in BUF, - non-zero otherwise. */ +/* Read from PORT until a delimiter (e.g., a whitespace) is read. Return + zero if the whole token fits in BUF, non-zero otherwise. */ static inline int read_token (SCM port, char *buf, size_t buf_size, size_t *read) { |